aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin André <martin.andre@gmail.com>2015-09-04 14:21:01 +0200
committerMartin André <martin.andre@gmail.com>2015-09-04 14:21:01 +0200
commit1805e540e502a4da974b2cb531df4905bfa5d4be (patch)
tree2fed1a5713f61a12f4d83805482f0dcf63e9bbb0
parent0292cd21299714ef479e50229574e842dab41df1 (diff)
downloadkolla-1805e540e502a4da974b2cb531df4905bfa5d4be.tar.gz
kolla-1805e540e502a4da974b2cb531df4905bfa5d4be.zip
Fix document references in documentation
Kolla documentation is now published online at http://docs.openstack.org/developer/kolla/. Fix document references to not point to external resources. Change-Id: Ie0a0114f269f5a12123718080627c8da86a8c91d
-rw-r--r--doc/dev-quickstart.rst8
-rw-r--r--doc/devenv-heat.rst5
2 files changed, 5 insertions, 8 deletions
diff --git a/doc/dev-quickstart.rst b/doc/dev-quickstart.rst
index a37f717bd..3cb9c8200 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.
@@ -152,7 +150,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/>`__