diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-04 15:12:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-04 15:12:58 +0000 |
| commit | 11cba5fb66849f3a5ef0fd578b59d2ca12a0cdce (patch) | |
| tree | 95b115af20350cbbd3657072ce8ecbc64ca73f7b | |
| parent | 88bdbf8db545e1cbf8bf7b83f1b97abb1023bdec (diff) | |
| parent | 1805e540e502a4da974b2cb531df4905bfa5d4be (diff) | |
| download | kolla-11cba5fb66849f3a5ef0fd578b59d2ca12a0cdce.tar.gz kolla-11cba5fb66849f3a5ef0fd578b59d2ca12a0cdce.zip | |
Merge "Fix document references in documentation"
| -rw-r--r-- | doc/dev-quickstart.rst | 8 | ||||
| -rw-r--r-- | doc/devenv-heat.rst | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/doc/dev-quickstart.rst b/doc/dev-quickstart.rst index 485a938fc..b17499322 100644 --- a/doc/dev-quickstart.rst +++ b/doc/dev-quickstart.rst @@ -9,12 +9,10 @@ available. These options permit the evaluation of Kolla without disrupting the host operating system. If developing or evaluating Kolla on an OpenStack cloud environment that -supports Heat, follow the -`Heat evaluation and developer environment guide <https://github.com/stackforge/kolla/blob/master/docs/devenv-heat.rst>`__. +supports Heat, follow the :doc:`Heat evaluation and developer environment guide <devenv-heat>`. If developing or evaluating Kolla on a system that provides VirtualBox, -Vagrant may be used and is documented in the -`Vagrant evaluation and developer environment guide <https://github.com/stackforge/kolla/blob/master/docs/devenv-vagrant.rst>`__. +Vagrant may be used and is documented in the :doc:`Vagrant evaluation and developer environment guide <devenv-vagrant>`. If evaluating or deploying OpenStack on bare-metal with Kolla, follow the instructions in this document to get started. @@ -157,7 +155,7 @@ Starting Kolla -------------- Configure Ansible by reading the -`Kolla Ansible configuration Guide <https://github.com/stackforge/kolla/blob/master/docs/ansible-deployment.rst>`__ documentation. +:doc:`Kolla Ansible configuration Guide <ansible-deployment>` documentation. Finally, run the deploy operation: diff --git a/doc/devenv-heat.rst b/doc/devenv-heat.rst index 019fe7ebd..ffbef1cd9 100644 --- a/doc/devenv-heat.rst +++ b/doc/devenv-heat.rst @@ -14,10 +14,9 @@ Docker host. Therefore, containers no longer connect to a docker0 bridge and have separate networking from the host. As a result, Kolla networking has a configuration similar to: -.. figure:: https://raw.githubusercontent.com/stackforge/kolla/master/devenv/kollanet.png - :alt: Image +.. image:: kollanet.png + :alt: Kolla networking - Image Sharing pid and networking namespaces is detailed in the `super privileged containers <http://sdake.io/2015/01/28/an-atomic-upgrade-process-for-openstack-compute-nodes/>`__ |