Add Liberty and Mitaka admonitions and use them

Many of our stable branch steps are actually specific to one branch,
so instead of having to remember to note that in the text of those
sections, let's just have an admonition that makes the version
explicit.

This also corrects the repo setup steps to separate the Liberty and
Mitaka repos, and moves the branch options to their own section in
the environment selector.

I did not touch the image building repo setup yet because I plan
to change that in a follow-up commit anyway so it matches what we
actually do in tripleo.sh/CI.

Change-Id: I871651f0dd782ad51127d5ef0b01be3806272820

doc/source/_custom/custom.css

@@ -62,6 +62,8 @@
 .portal {background-color: #ded;}
 .satellite {background-color: #dee;}
 .stable {background: #eed;}
+.liberty {background: #ede;}
+.mitaka {background: #dee;}
 .centos {background: #fef;}
 .baremetal {background: #eef;}
 .virtual {background: #efe;}

doc/source/_templates/layout.html

@@ -20,6 +20,13 @@
         <li><input type="checkbox" id="rhel" checked="checked"><label for="rhel" title="Step that should only be run when using RHEL.">RHEL</label></li>
       </ul>
 
+      <span class="title">Branches</span>
+      <ul>
+        <li><input type="checkbox" id="stable" checked=""><label for="stable" title="Step that should only be run when choosing to use components from their stable branches rather than using packages/source based on current master.">Install from stable branch</label></li>
+        <li><input type="checkbox" id="liberty" checked=""><label for="liberty" title="Step that should only be run when installing from the Liberty stable branch.">Install from Liberty branch</label></li>
+        <li><input type="checkbox" id="mitaka" checked=""><label for="mitaka" title="Step that should only be run when installing from the Mitaka stable branch.">Install from Mitaka branch</label></li>
+      </ul>
+
       <span class="title">RHEL Registration Types</span>
       <ul>
         <li><input type="checkbox" id="portal" checked="checked"><label for="portal" title="Step that should only be run when registering to the Red Hat Portal.">Portal</label></li>
@@ -43,8 +50,6 @@
       <ul>
          <li><input type="checkbox" id="source" checked=""><label for="source"
             title="Step that should only be run when choosing to use some components directly from their git source code repositories instead of packages.">Install from source</label></li>
-        <li><input type="checkbox" id="stable" checked=""><label for="stable"
-            title="Step that should only be run when choosing to use components from their stable branches rather than using packages/source based on current master.">Install from stable branch</label></li>
       </ul>
 
 

doc/source/basic_deployment/basic_deployment_cli.rst

@@ -87,13 +87,20 @@ non-root user that was used to install the undercloud.
         export DELOREAN_TRUNK_REPO="http://buildlogs.centos.org/centos/7/cloud/x86_64/rdo-trunk-master-tripleo/"
         export DELOREAN_REPO_FILE="delorean.repo"
 
-   .. admonition:: Stable Branch
-      :class: stable
+   .. admonition:: Liberty
+      :class: liberty
 
       ::
 
           export DELOREAN_TRUNK_REPO="http://trunk.rdoproject.org/centos7-liberty/current/"
 
+   .. admonition:: Mitaka
+      :class: mitaka
+
+      ::
+
+          export DELOREAN_TRUNK_REPO="http://trunk.rdoproject.org/centos7-mitaka/current/"
+
 
 #. Build the required images:
 
@@ -183,8 +190,8 @@ The file to be imported may be either JSON, YAML or CSV format, and
 the type is detected via the file extension (json, yaml, csv).
 The file format is documented in :ref:`instackenv`.
 
-.. admonition:: Stable Branch
-   :class: stable
+.. admonition:: Liberty
+   :class: liberty
 
    For TripleO release Liberty and older an explicit ``--json`` or ``--csv``
    flag is required for JSON and CSV formats accordingly.

doc/source/index.rst

@@ -73,6 +73,16 @@ Linux (RHEL). These steps are marked as follows:
    Step that should only be run when choosing to use components from their
    stable branches rather than using packages/source based on current master.
 
+.. admonition:: Liberty
+   :class: liberty
+
+   Step that should only be run when installing from the Liberty stable branch.
+
+.. admonition:: Mitaka
+   :class: mitaka
+
+   Step that should only be run when installing from the Mitaka stable branch.
+
 .. admonition:: SSL
    :class: ssl
 

doc/source/repositories.txt

@@ -1,3 +1,40 @@
+   .. admonition:: Stable Branch
+      :class: stable
+
+      Enable the appropriate repos for the desired release, as indicated below.
+      Do not enable any other repos not explicitly marked for that release.
+
+      .. admonition:: Liberty
+         :class: liberty
+
+         Enable latest RDO Liberty Delorean repository for all packages
+
+         ::
+
+            sudo curl -L -o /etc/yum.repos.d/delorean-liberty.repo https://trunk.rdoproject.org/centos7-liberty/current/delorean.repo
+
+         Enable the Liberty Delorean Deps repository
+
+         ::
+
+            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
+
+         Enable latest RDO Mitaka Delorean repository for all packages
+
+         ::
+
+            sudo curl -L -o /etc/yum.repos.d/delorean-mitaka.repo https://trunk.rdoproject.org/centos7-mitaka/current/delorean.repo
+
+         Enable the Mitaka Delorean Deps repository
+
+         ::
+
+            sudo curl -L -o /etc/yum.repos.d/delorean-deps-mitaka.repo http://trunk.rdoproject.org/centos7-mitaka/delorean-deps.repo
+
+
    Enable last known good RDO Trunk Delorean repository for core openstack packages
 
    ::
@@ -21,20 +58,3 @@
    ::
 
      sudo curl -L -o /etc/yum.repos.d/delorean-deps.repo http://trunk.rdoproject.org/centos7/delorean-deps.repo
-
-   .. admonition:: Stable Branch
-      :class: stable
-
-      *Skip all repos mentioned above, other than epel-release which is still required.*
-
-      Enable latest RDO Stable Delorean repository for all packages
-
-      ::
-
-         sudo curl -L -o /etc/yum.repos.d/delorean-liberty.repo https://trunk.rdoproject.org/centos7-liberty/current/delorean.repo
-
-      Enable the Delorean Deps repository
-
-      ::
-
-         sudo curl -L -o /etc/yum.repos.d/delorean-deps-liberty.repo http://trunk.rdoproject.org/centos7-liberty/delorean-deps.repo