From 2c7631f902b716c03cb2b919b418fc286f4d7236 Mon Sep 17 00:00:00 2001
From: Jiri Stransky <jistr@redhat.com>
Date: Tue, 9 Aug 2016 11:20:12 +0200
Subject: [PATCH] Fix environment-specific limiting for upgrade docs

We now properly tag the repository switching admonitions so that they
show up correctly with regards to the state of "Limit Environment
Specific Content" checkboxes for the "Upgrade Version" category.

This means we also have to add Kilo to Liberty upgrade tag so that
Liberty repos are properly tagged and hideable, even though Kilo to
Liberty upgrades aren't really supported. This peculiar situation will
resolve itself once we remove Liberty-specific steps from the
documentation.

Also a minor tweak is removing a TODO comment from the docs. We'll keep
tweaking the docs as we improve he upgrades experience in that regard.

Change-Id: I1f2c85d89016ce30f392fc05aa35d6796588d748
---
 doc/source/_templates/layout.html      | 1 +
 doc/source/post_deployment/upgrade.rst | 1 -
 doc/source/repositories.txt            | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/source/_templates/layout.html b/doc/source/_templates/layout.html
index 31d3ce52..e6b6ae92 100644
--- a/doc/source/_templates/layout.html
+++ b/doc/source/_templates/layout.html
@@ -54,6 +54,7 @@
 
       <span class="title">Upgrade Version</span>
       <ul>
+        <li><input type="checkbox" id="ktol" checked="checked"><label for="ktol" title="Upgrading Kilo to Liberty is not supported">Upgrading Kilo to Liberty (unsupported)</label></li>
         <li><input type="checkbox" id="ltom" checked="checked"><label for="ltom" title="Step that should only be run for upgrading from Liberty to Mitaka">Upgrading Liberty to Mitaka</label></li>
         <li><input type="checkbox" id="mton" checked="checked"><label for="mton" title="Step that should only be run for upgrading from Mitaka to Newton">Upgrading Mitaka to Newton</label></li>
       </ul>
diff --git a/doc/source/post_deployment/upgrade.rst b/doc/source/post_deployment/upgrade.rst
index 4379ce19..5f5eff43 100644
--- a/doc/source/post_deployment/upgrade.rst
+++ b/doc/source/post_deployment/upgrade.rst
@@ -81,7 +81,6 @@ Upgrading the Undercloud
 
    The following command will upgrade the undercloud::
 
-      # TODO: In the future this might be taken care of by tripleoclient automatically
       sudo systemctl stop openstack-*
       sudo systemctl stop neutron-*
       sudo yum -y update instack-undercloud openstack-puppet-modules openstack-tripleo-common python-tripleoclient
diff --git a/doc/source/repositories.txt b/doc/source/repositories.txt
index 3f526a10..3c76b048 100644
--- a/doc/source/repositories.txt
+++ b/doc/source/repositories.txt
@@ -5,7 +5,7 @@
       Do not enable any other repos not explicitly marked for that release.
 
       .. admonition:: Liberty
-         :class: liberty
+         :class: liberty ktol
 
          Enable latest RDO Liberty Delorean repository for all packages
 
@@ -20,7 +20,7 @@
             sudo curl -L -o /etc/yum.repos.d/delorean-deps-liberty.repo http://trunk.rdoproject.org/centos7-liberty/delorean-deps.repo
 
       .. admonition:: Mitaka
-         :class: mitaka
+         :class: mitaka ltom
 
          Enable latest RDO Mitaka Delorean repository for all packages