Merge "Update docs for deploying Queens"

_custom/custom.css

@@ -65,6 +65,7 @@
 .newton {background: #ede;}
 .ocata {background: #edd;}
 .pike {background: #dfb;}
+.queens {background: #afd;}
 .centos {background: #fef;}
 .baremetal {background: #eef;}
 .virtual {background: #efe;}
@@ -73,6 +74,7 @@
 .mton {background: #ded;}
 .ntoo {background: #edd;}
 .otop {background: #dfb;}
+.ptoq {background: #afd;}
 .validations {background: #fdd;}
 .optional {background: #ffe;}
 

doc/source/install/containers_deployment/overcloud.rst

@@ -109,6 +109,36 @@ pull and push destinations::
       --output-env-file ~/docker_registry.yaml \
       --output-images-file overcloud_containers.yaml
 
+.. admonition:: Stable Branch
+  :class: stable
+
+  If you wish to deploy a stable version, you will need to pull down the
+  correct containers for the version being deployed.
+
+  .. admonition:: Pike
+     :class: pike
+
+     Use the Pike containers::
+
+         openstack overcloud container image prepare \
+          --namespace docker.io/tripleopike \
+          --tag <tag> \
+          --push-destination 192.168.24.1:8787 \
+          --output-env-file ~/docker_registry.yaml \
+          --output-images-file overcloud_containers.yaml
+
+  .. admonition:: Queens
+     :class: queens
+
+     Use the Queens containers::
+
+         openstack overcloud container image prepare \
+          --namespace docker.io/tripleoqueens \
+          --tag <tag> \
+          --push-destination 192.168.24.1:8787 \
+          --output-env-file ~/docker_registry.yaml \
+          --output-images-file overcloud_containers.yaml
+
 Then upload the images to the local registry using the generated file::
 
     openstack overcloud container image upload --config-file overcloud_containers.yaml

doc/source/install/repositories.txt

@@ -60,6 +60,21 @@ For example::
 
             sudo -E tripleo-repos -b pike current ceph
 
+  .. admonition:: Queens
+     :class: queens ptoq
+
+     Enable the current Queens repositories::
+
+         sudo -E tripleo-repos -b queens current
+
+     .. admonition:: Ceph
+        :class: ceph
+
+        Include the Ceph repo in the tripleo-repos call::
+
+            sudo -E tripleo-repos -b queens current ceph
+
+
 .. warning::
    The remaining repositories configuration steps below should not be done for stable
    releases!