Restructuring the Quickstart guide

We need the gcc and other dependencies
installed before we can do any tox related
commands.

Installation of git was never checked in QSG.
I happened to create a baremetal CentOS server
with minimal install and there was no git.
Added steps to install git.

Moved the steps related to git clone and other
kolla configuration after basic installation.
since tox fails for gcc.

In the quickstart guide we are generating
the configuration using tox but tox is not
installed before doing so. Adding steps to
install tox before generating conf.

Change-Id: Ic8a756e66d33963e47607ed60c4c768e0859152d

1 files changed, 33 insertions, 22 deletions

diff --git a/doc/quickstart.rst b/doc/quickstart.rst
index 566a3cb52..2223d7790 100644
--- a/doc/quickstart.rst
+++ b/doc/quickstart.rst
@@ -76,26 +76,6 @@ Make sure the "pip" package manager is installed before proceeding:
     # Ubuntu 14.04 LTS
     apt-get install python-pip
 
-To clone the Kolla repo, install git and use:
-
-::
-
-    git clone https://git.openstack.org/openstack/kolla
-
-To install Kolla tools and Python dependencies use:
-
-::
-
-    pip install kolla/
-
-Copy Kolla configuration to /etc:
-
-::
-
-    cd kolla
-    cp -r etc/kolla /etc/
-    tox -e genconfig
-
 Since Docker is required to build images as well as be present on all deployed
 targets, the Kolla community recommends installing the official Docker, Inc.
 packaged version of Docker for maximum stability and compatibility with the
@@ -147,10 +127,10 @@ following requirements are needed to build the client code:
 ::
 
    # Ubuntu
-   apt-get install -y python-dev libffi-dev libssl-dev gcc
+   apt-get install -y python-dev libffi-dev libssl-dev gcc git
 
    # Centos 7
-   yum install -y python-devel libffi-devel openssl-devel gcc
+   yum install -y python-devel libffi-devel openssl-devel gcc git
 
 To install these clients use:
 
@@ -158,6 +138,37 @@ To install these clients use:
 
     pip install -U python-openstackclient
 
+To clone the Kolla repo:
+
+::
+
+    git clone https://git.openstack.org/openstack/kolla
+
+To install Kolla tools and Python dependencies use:
+
+::
+
+    pip install kolla/
+
+Copy Kolla configuration to /etc:
+
+::
+
+    cd kolla
+    cp -r etc/kolla /etc/
+
+Optionally, you can install tox and generate the build configuration using
+following steps.
+
+::
+
+    pip install tox
+    tox -e genconfig
+
+The location of the generated configuration file is ``etc/kolla/kolla-build.conf``,
+You can also copy it to ``/etc/kolla``. The default location is one of
+``/etc/kolla/kolla-build.conf`` or ``etc/kolla/kolla-build.conf``.
+
 OpenStack, RabbitMQ, and Ceph require all hosts to have matching times to ensure
 proper message delivery. In the case of Ceph, it will complain if the hosts
 differ by more than 0.05 seconds. Some OpenStack services have timers as low as