aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Gonzalez <dabarren@gmail.com>2017-09-25 13:08:17 +0200
committerEduardo Gonzalez <dabarren@gmail.com>2017-09-25 13:56:30 +0200
commit197a264a3b772f9d6c9c9775bf00357e2a7a9a10 (patch)
tree5b62f60574d50527413be357eac0eb47327a6268
parentebd8d765f96e9537f729c607350edf112c9abe53 (diff)
downloadkolla-ansible-197a264a3b772f9d6c9c9775bf00357e2a7a9a10.tar.gz
kolla-ansible-197a264a3b772f9d6c9c9775bf00357e2a7a9a10.zip
Fix deploy-guide links
Deploy guides includes quickstart guide. Includes respect relative paths, but when quickstart includes vagrant doc, deploy-guide tries to locate the doc in its doctree (deploy-guide/source). This causes error 404 and deploy-guide post-gates to fail Change-Id: I05e49bbcef564ad4f3d80f0649ccf191d9f8b59d
-rw-r--r--deploy-guide/source/multinode.rst2
-rw-r--r--deploy-guide/source/quickstart.rst3
-rw-r--r--doc/source/contributor/CONTRIBUTING.rst4
-rw-r--r--doc/source/user/quickstart.rst2
4 files changed, 6 insertions, 5 deletions
diff --git a/deploy-guide/source/multinode.rst b/deploy-guide/source/multinode.rst
index f5a22f6c9..e1d9f87b9 100644
--- a/deploy-guide/source/multinode.rst
+++ b/deploy-guide/source/multinode.rst
@@ -1,2 +1,2 @@
.. multinode:
-.. include:: ../../doc/multinode.rst
+.. include:: ../../doc/source/user/multinode.rst
diff --git a/deploy-guide/source/quickstart.rst b/deploy-guide/source/quickstart.rst
index 63f89ea55..5791e4d01 100644
--- a/deploy-guide/source/quickstart.rst
+++ b/deploy-guide/source/quickstart.rst
@@ -1,2 +1,3 @@
.. quickstart:
-.. include:: ../../doc/quickstart.rst
+
+.. include:: ../../doc/source/user/quickstart.rst
diff --git a/doc/source/contributor/CONTRIBUTING.rst b/doc/source/contributor/CONTRIBUTING.rst
index 07b24c528..27c0e36af 100644
--- a/doc/source/contributor/CONTRIBUTING.rst
+++ b/doc/source/contributor/CONTRIBUTING.rst
@@ -30,8 +30,8 @@ Basics
Development Environment
=======================
-Please follow our :doc:`/user/quickstart` to deploy your environment and test your
-changes.
+Please follow our :doc:`/user/quickstart` to deploy your environment and test
+your changes.
Please use the existing sandbox repository, available at
https://git.openstack.org/cgit/openstack-dev/sandbox, for learning, understanding
diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst
index bdb996ec4..c85b8f29d 100644
--- a/doc/source/user/quickstart.rst
+++ b/doc/source/user/quickstart.rst
@@ -29,7 +29,7 @@ bare metal or a virtual machine with Kolla.
If developing Kolla on a system that provides VirtualBox or Libvirt in addition
to Vagrant, use the Vagrant virtual environment documented in
-:doc:`/contributor/vagrant-dev-env`.
+`Development Environment with Vagrant <https://docs.openstack.org/kolla-ansible/latest/contributor/vagrant-dev-env.html>`_.
Prerequisites
=============