From e121ecb380d7f7e962fbd1afe5c402ef6b277171 Mon Sep 17 00:00:00 2001 From: Sayantani Goswami Date: Thu, 2 Feb 2017 19:29:57 +0000 Subject: [PATCH] Update links in documents Update documents reference image-building documents correctly after image-building.rst was deleted from kolla-ansible directory. Change-Id: Ib66475e1f0f3055f2e38fc33ae649cae300c9c36 --- doc/multinode.rst | 6 +++--- doc/quickstart.rst | 5 +++-- doc/vagrant-dev-env.rst | 4 +++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/multinode.rst b/doc/multinode.rst index b88a248ff2..6b4d82524b 100644 --- a/doc/multinode.rst +++ b/doc/multinode.rst @@ -37,7 +37,7 @@ Configure Docker on all nodes 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 -:doc:`image-building`). +`Building Container Images`_). After starting the registry, it is necessary to instruct Docker that it will be communicating with an insecure registry. To enable insecure registry @@ -148,10 +148,10 @@ to them: kolla-ansible prechecks -i -For additional environment setup see the :ref:`deploying-kolla`. - Run the deployment: :: kolla-ansible deploy -i + +.. _Building Container Images: http://docs.openstack.org/developer/kolla/image-building.html diff --git a/doc/quickstart.rst b/doc/quickstart.rst index 3f2f5a0300..38070a4727 100644 --- a/doc/quickstart.rst +++ b/doc/quickstart.rst @@ -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, 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 ========================================== @@ -471,7 +471,7 @@ View the images. Developers running from master are required to build container images as 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: @@ -671,3 +671,4 @@ default to ``kolla_internal_vip_address``. .. _Docker Hub Image Registry: https://hub.docker.com/u/kolla/ .. _launchpad bug: https://bugs.launchpad.net/kolla/+filebug +.. _Building Container Images: http://docs.openstack.org/developer/kolla/image-building.html diff --git a/doc/vagrant-dev-env.rst b/doc/vagrant-dev-env.rst index b7ead7d67f..a2162aceb9 100644 --- a/doc/vagrant-dev-env.rst +++ b/doc/vagrant-dev-env.rst @@ -126,7 +126,7 @@ Once logged on the **operator** VM call the ``kolla-build`` utility:: 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** option is enabled (in Vagrant this is the default behaviour). @@ -159,3 +159,5 @@ Further Reading All Vagrant documentation can be found at `docs.vagrantup.com `__. + +.. _Building Container Images: http://docs.openstack.org/developer/kolla/image-building.html