openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix document references in documentation"

Browse Source
This commit is contained in:
Jenkins 2015-09-04 15:12:58 +00:00 committed by Gerrit Code Review
commit 11cba5fb66
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/dev-quickstart.rst
View File

@ -9,12 +9,10 @@ available. These options permit the evaluation of Kolla without
disrupting the host operating system. disrupting the host operating system.
If developing or evaluating Kolla on an OpenStack cloud environment that If developing or evaluating Kolla on an OpenStack cloud environment that
supports Heat, follow the supports Heat, follow the :doc:`Heat evaluation and developer environment guide <devenv-heat>`.
`Heat evaluation and developer environment guide <https://github.com/stackforge/kolla/blob/master/docs/devenv-heat.rst>`__.
If developing or evaluating Kolla on a system that provides VirtualBox, If developing or evaluating Kolla on a system that provides VirtualBox,
Vagrant may be used and is documented in the Vagrant may be used and is documented in the :doc:`Vagrant evaluation and developer environment guide <devenv-vagrant>`.
`Vagrant evaluation and developer environment guide <https://github.com/stackforge/kolla/blob/master/docs/devenv-vagrant.rst>`__.
If evaluating or deploying OpenStack on bare-metal with Kolla, follow the If evaluating or deploying OpenStack on bare-metal with Kolla, follow the
instructions in this document to get started. instructions in this document to get started.
@ -157,7 +155,7 @@ Starting Kolla
-------------- --------------
Configure Ansible by reading the 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: Finally, run the deploy operation:

5
doc/devenv-heat.rst
View File

@ -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 and have separate networking from the host. As a result, Kolla
networking has a configuration similar to: networking has a configuration similar to:
.. figure:: https://raw.githubusercontent.com/stackforge/kolla/master/devenv/kollanet.png .. image:: kollanet.png
:alt: Image :alt: Kolla networking
Image
Sharing pid and networking namespaces is detailed in the `super Sharing pid and networking namespaces is detailed in the `super
privileged privileged
containers <http://sdake.io/2015/01/28/an-atomic-upgrade-process-for-openstack-compute-nodes/>`__ containers <http://sdake.io/2015/01/28/an-atomic-upgrade-process-for-openstack-compute-nodes/>`__