From 0b27baf3cee5cae3d6bbafe7d834276a05e39b7e Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 21 May 2019 10:29:24 +0100
Subject: [PATCH] Fix quickstart for virtual environments
The etc_examples and inventory should be copied from the virtual
environment rather than the system.
Change-Id: I3ac1e057971b7481a0bce2a15351031e51bf97d6
Closes-Bug: #1829435
---
doc/source/user/quickstart.rst | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst
index 31870cca1..7913aa9f3 100644
--- a/doc/source/user/quickstart.rst
+++ b/doc/source/user/quickstart.rst
@@ -170,13 +170,19 @@ Install Kolla-ansible for deployment or evaluation
#. Copy ``globals.yml`` and ``passwords.yml`` to ``/etc/kolla`` directory.
- For CentOS, run:
+ If using a virtual environment:
+
+ .. code-block:: console
+
+ cp -r /path/to/virtualenv/share/kolla-ansible/etc_examples/kolla/* /etc/kolla
+
+ If not using a virtual environment on CentOS, run:
.. code-block:: console
cp -r /usr/share/kolla-ansible/etc_examples/kolla/* /etc/kolla
- For Ubuntu, run:
+ If not using a virtual environment on Ubuntu, run:
.. code-block:: console
@@ -185,13 +191,19 @@ Install Kolla-ansible for deployment or evaluation
#. Copy ``all-in-one`` and ``multinode`` inventory files to
the current directory.
- For CentOS, run:
+ If using a virtual environment:
+
+ .. code-block:: console
+
+ cp /path/to/virtualenv/share/kolla-ansible/ansible/inventory/* .
+
+ If not using a virtual environment on CentOS, run:
.. code-block:: console
cp /usr/share/kolla-ansible/ansible/inventory/* .
- For Ubuntu, run:
+ If not using a virtual environment on Ubuntu, run:
.. code-block:: console
--
GitLab