aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-05 02:59:58 +0000
committerGerrit Code Review <review@openstack.org>2018-07-05 02:59:58 +0000
commitb44bade5f3e7301a6d197577f8a314f1c1826d8a (patch)
tree2ce6e070d81a37e5ae38f44dc2894f906e5d44ee /doc
parentfd3f54faedcfa4069eccf93e3933d28e6d683a7f (diff)
parent47e2b6221bb4d11f56d9b08e6098ca5557350c5a (diff)
downloadkolla-ansible-b44bade5f3e7301a6d197577f8a314f1c1826d8a.tar.gz
kolla-ansible-b44bade5f3e7301a6d197577f8a314f1c1826d8a.zip
Merge "Update using openstack section of quickstart"
Diffstat (limited to 'doc')
-rw-r--r--doc/source/user/quickstart.rst61
1 files changed, 37 insertions, 24 deletions
diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst
index 932c279e6..3f32b6f24 100644
--- a/doc/source/user/quickstart.rst
+++ b/doc/source/user/quickstart.rst
@@ -502,47 +502,60 @@ If error occurs during execution, refer to
Using OpenStack
~~~~~~~~~~~~~~~
-OpenStack requires an openrc file where credentials for admin user etc are set.
-To generate this file run
+#. Install basic OpenStack CLI clients:
-.. code-block:: console
+ .. code-block:: console
- kolla-ansible post-deploy
- . /etc/kolla/admin-openrc.sh
+ pip install python-openstackclient python-glanceclient python-neutronclient
-.. end
+ .. end
-Install basic OpenStack CLI clients:
+#. OpenStack requires an openrc file where credentials for admin user
+ are set. To generate this file:
-.. code-block:: console
+ * For deployment or evaluation, run:
- pip install python-openstackclient python-glanceclient python-neutronclient
+ .. code-block:: console
-.. end
+ kolla-ansible post-deploy
+ . /etc/kolla/admin-openrc.sh
-Depending on how you installed Kolla-Ansible, there is script that will create
-example networks, images, and so on.
+ .. end
-For pip install and CentOS host:
+ * For development, run:
-.. code-block:: console
+ .. code-block:: console
- . /usr/share/kolla-ansible/init-runonce
+ cd kolla-ansible/tools
+ ./kolla-ansible post-deploy
+ . /etc/kolla/admin-openrc.sh
-.. end
+ .. end
-For pip install and Ubuntu host:
+#. Depending on how you installed Kolla-Ansible, there is a script that will
+ create example networks, images, and so on.
-.. code-block:: console
+ * For deployment or evaluation,
+ run ``init-runonce`` script on CentOS:
- . /usr/local/share/kolla-ansible/init-runonce
+ .. code-block:: console
-.. end
+ . /usr/share/kolla-ansible/init-runonce
-For git pulled source:
+ .. end
-.. code-block:: console
+ Run ``init-runonce`` script on Ubuntu:
- . kolla-ansible/tools/init-runonce
+ .. code-block:: console
-.. end
+ . /usr/local/share/kolla-ansible/init-runonce
+
+ .. end
+
+ * For development, run:
+
+ .. code-block:: console
+
+ . kolla-ansible/tools/init-runonce
+
+ .. end