summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-21 21:35:20 +0000
committerGerrit Code Review <review@openstack.org>2016-09-21 21:35:20 +0000
commitba75f514bcba5c2dbdd76454a45712ea3eb8523a (patch)
tree76513d7b1426d9dae7a3d4900bbd04566748ed46 /doc
parentbb617a67ffe21e51bd891771b6dc272cdad04a2e (diff)
parentfa2b96297ca2451bd5621c9c0bd8d85fa81b13a3 (diff)
downloadkolla-ba75f514bcba5c2dbdd76454a45712ea3eb8523a.tar.gz
kolla-ba75f514bcba5c2dbdd76454a45712ea3eb8523a.zip
Merge "Point to boostrap-servers playbook in quickstart"
Diffstat (limited to 'doc')
-rw-r--r--doc/multinode.rst2
-rw-r--r--doc/production-architecture-guide.rst2
-rw-r--r--doc/quickstart.rst23
3 files changed, 27 insertions, 0 deletions
diff --git a/doc/multinode.rst b/doc/multinode.rst
index 245cbc30b..46de3f252 100644
--- a/doc/multinode.rst
+++ b/doc/multinode.rst
@@ -87,6 +87,8 @@ Restart docker by executing the following commands:
# Ubuntu with upstart or sysvinit
sudo service docker restart
+.. _edit-inventory:
+
Edit the Inventory File
=======================
diff --git a/doc/production-architecture-guide.rst b/doc/production-architecture-guide.rst
index 63d5e895e..6fc560d16 100644
--- a/doc/production-architecture-guide.rst
+++ b/doc/production-architecture-guide.rst
@@ -29,6 +29,8 @@ A basic Kolla inventory consists of several types of nodes, known in Ansible as
Network configuration
=====================
+.. _interface-configuration:
+
Interface configuration
***********************
diff --git a/doc/quickstart.rst b/doc/quickstart.rst
index 56700134a..82f60b4af 100644
--- a/doc/quickstart.rst
+++ b/doc/quickstart.rst
@@ -27,6 +27,29 @@ started with deploying OpenStack on bare metal or a virtual machine with Kolla.
There are other deployment environments referenced below in
`Additional Environments`_.
+Automatic host bootstrap
+========================
+
+.. note:: New in Newton
+
+To quickly prepare hosts for Kolla, playbook ``bootstrap-servers`` can be used.
+This is an Ansible playbook which works on Ubuntu 14.04, 16.04 and CentOS 7
+hosts to install and prepare cluster for Kolla installation.
+
+.. note:: Installation of dependencies for deployment node and configuration
+ of Kolla interfaces is still required prior to running this command. More
+ information about Kolla interface configuration in
+ :ref:`interface-configuration`.
+
+Command to run the playbook:
+
+::
+
+ kolla-ansible -i <<inventory file>> bootstrap-servers
+
+To learn more about the inventory file, follow :ref:`edit-inventory`.
+
+
Install Dependencies
====================