openstack/kolla-ansible
Code Issues Proposed changes

Merge "Update links in documents"

Browse Source
This commit is contained in:
Jenkins 2017-02-03 20:24:26 +00:00 committed by Gerrit Code Review
commit 83d99ecf0c
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/multinode.rst
View File

@ -37,7 +37,7 @@ Configure Docker on all nodes
The ``start-registry`` script configures a docker registry that proxies Kolla The ``start-registry`` script configures a docker registry that proxies Kolla
images from Docker Hub, and can also be used with custom built images (see images from Docker Hub, and can also be used with custom built images (see
:doc:`image-building`). `Building Container Images`_).
After starting the registry, it is necessary to instruct Docker that it will After starting the registry, it is necessary to instruct Docker that it will
be communicating with an insecure registry. To enable insecure registry be communicating with an insecure registry. To enable insecure registry
@ -148,10 +148,10 @@ to them:
kolla-ansible prechecks -i <path/to/multinode/inventory/file> kolla-ansible prechecks -i <path/to/multinode/inventory/file>
For additional environment setup see the :ref:`deploying-kolla`.
Run the deployment: Run the deployment:
:: ::
kolla-ansible deploy -i <path/to/multinode/inventory/file> kolla-ansible deploy -i <path/to/multinode/inventory/file>
.. _Building Container Images: http://docs.openstack.org/developer/kolla/image-building.html

5
doc/quickstart.rst
View File

@ -324,7 +324,7 @@ For mounting /run and /var/lib/nova/mnt as shared upon startup, edit
If CentOS/Fedora/OracleLinux container images are built on an Ubuntu host, If CentOS/Fedora/OracleLinux container images are built on an Ubuntu host,
the back-end storage driver must not be AUFS (see the known issues in the back-end storage driver must not be AUFS (see the known issues in
:doc:`image-building`). `Building Container Images`_).
Install Kolla for deployment or evaluation Install Kolla for deployment or evaluation
========================================== ==========================================
@ -471,7 +471,7 @@ View the images.
Developers running from master are required to build container images as Developers running from master are required to build container images as
the Docker Hub does not contain built images for the master branch. the Docker Hub does not contain built images for the master branch.
Reference the :doc:`image-building` for more advanced build configuration. Reference the `Building Container Images`_ for more advanced build configuration.
To build images using default parameters run: To build images using default parameters run:
@ -671,3 +671,4 @@ default to ``kolla_internal_vip_address``.
.. _Docker Hub Image Registry: https://hub.docker.com/u/kolla/ .. _Docker Hub Image Registry: https://hub.docker.com/u/kolla/
.. _launchpad bug: https://bugs.launchpad.net/kolla/+filebug .. _launchpad bug: https://bugs.launchpad.net/kolla/+filebug
.. _Building Container Images: http://docs.openstack.org/developer/kolla/image-building.html

4
doc/vagrant-dev-env.rst
View File

@ -126,7 +126,7 @@ Once logged on the **operator** VM call the ``kolla-build`` utility::
kolla-build kolla-build
``kolla-build`` accept arguments as documented in :doc:`image-building`. It ``kolla-build`` accept arguments as documented in `Building Container Images`_. It
builds Docker images and pushes them to the local registry if the **push** builds Docker images and pushes them to the local registry if the **push**
option is enabled (in Vagrant this is the default behaviour). option is enabled (in Vagrant this is the default behaviour).
@ -159,3 +159,5 @@ Further Reading
All Vagrant documentation can be found at All Vagrant documentation can be found at
`docs.vagrantup.com <http://docs.vagrantup.com>`__. `docs.vagrantup.com <http://docs.vagrantup.com>`__.
.. _Building Container Images: http://docs.openstack.org/developer/kolla/image-building.html