Merge "Update the "ocata" to "pike" for multinode.html"

This commit is contained in:
Zuul 2017-09-29 04:33:39 +00:00 committed by Gerrit Code Review
commit 9cf89634c6

View File

@ -391,7 +391,7 @@ installation when developing for master. Since no master images are available
on docker hub, the docker cache may be used for all-in-one deployments. When on docker hub, the docker cache may be used for all-in-one deployments. When
deploying multinode, a registry is strongly recommended to serve as a single deploying multinode, a registry is strongly recommended to serve as a single
source of images. Reference the source of images. Reference the
`Multinode Deployment of Kolla <https://docs.openstack.org/project-deploy-guide/kolla-ansible/ocata/multinode.html>`_ `Multinode Deployment of Kolla <https://docs.openstack.org/project-deploy-guide/kolla-ansible/pike/multinode.html>`_
for more information on using a local Docker registry. for more information on using a local Docker registry.
Otherwise, the Docker Hub Image Registry contains all Otherwise, the Docker Hub Image Registry contains all
images from each of Kollas major releases. The latest release tag is 5.0.0 for images from each of Kollas major releases. The latest release tag is 5.0.0 for
@ -539,7 +539,7 @@ There are two methods of deployment: *all-in-one* and *multinode*. The
OpenStack services on a single host. In the *multinode* deployment, OpenStack OpenStack services on a single host. In the *multinode* deployment, OpenStack
services can be run on specific hosts. This documentation describes deploying services can be run on specific hosts. This documentation describes deploying
an *all-in-one* setup. To setup *multinode* see the an *all-in-one* setup. To setup *multinode* see the
`Multinode Deployment of Kolla <https://docs.openstack.org/project-deploy-guide/kolla-ansible/ocata/multinode.html>`_. `Multinode Deployment of Kolla <https://docs.openstack.org/project-deploy-guide/kolla-ansible/pike/multinode.html>`_.
.. note:: .. note::