From eee6af5ef55cc19e985474a5f70deb3a6cf20e57 Mon Sep 17 00:00:00 2001
From: Proskurin Kirill <kproskurin@mirantis.com>
Date: Tue, 3 Nov 2015 17:25:02 +0300
Subject: [PATCH] Few improvements in the quickstart doc

Fixed commands for disabling\stoping libvirt and ntpd in different OS

I encourage to install kolla tools via pip, so user could get rid
of relative paths to config and scripts and run it from everythere.

Change-Id: I77271ce2f72fbaa7d6586a84f7998a9888d9b3a2
---
 doc/quickstart.rst | 69 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 49 insertions(+), 20 deletions(-)

diff --git a/doc/quickstart.rst b/doc/quickstart.rst
index d913c2f74b..8b249cc99a 100644
--- a/doc/quickstart.rst
+++ b/doc/quickstart.rst
@@ -67,13 +67,28 @@ Docker Python           1.2.0        none         On target nodes
 Python Jinja2           2.6.0        none         On deployment host
 =====================   ===========  ===========  =========================
 
-To install Python dependencies use:
+Make sure "pip" package manager is installed before procceed:
+
+::
+
+    # Centos 7
+    easy_install pip
+
+    # Ubuntu 14.04 LTS
+    sudo apt-get install python-pip
+
+To install Kolla tools and Python dependencies use:
 
 ::
 
     git clone https://git.openstack.org/openstack/kolla
-    cd kolla
-    sudo pip install -r requirements.txt
+    pip install kolla/
+
+Copy Kolla configuration to /etc:
+
+::
+
+    cp -r kolla/etc/kolla /etc/
 
 Since Docker is required to build images as well as be present on all deployed
 targets, the Kolla community recommends installing the Docker Inc. packaged
@@ -99,8 +114,8 @@ commands:
 ::
 
     # Centos 7
-    yum downgrade docker-engine-1.8.2-1
-    service docker-engine restart
+    yum downgrade docker-engine-1.8.2
+    systemctl restart docker.service
 
     # Ubuntu 14.04 LTS
     sudo apt-get install docker-engine=1.8.2-0~trusty
@@ -114,11 +129,10 @@ following requirements are needed to build the client code:
 ::
 
    # Ubuntu
-   sudo apt-get install -y python-dev python-pip libffi-dev libssl-dev
+   sudo apt-get install -y python-dev libffi-dev libssl-dev gcc
 
    # Centos 7
-   easy_install pip
-   yum install -y python-devel libffi-devel openssl-devel
+   yum install -y python-devel libffi-devel openssl-devel gcc
 
 To install these clients use:
 
@@ -138,8 +152,8 @@ execute the following:
 
     # Centos 7
     yum -y install ntp
-    systemctl enable ntpd
-    systemctl start ntpd
+    systemctl enable ntpd.service
+    systemctl start ntpd.service
 
     # Ubuntu
     sudo apt-get install ntp
@@ -150,8 +164,13 @@ be running at a time.
 
 ::
 
-    service libvirtd disable
-    service libvirtd stop
+    # Centos 7
+    systemctl stop libvirtd.service
+    systemctl disable libvirtd.service
+
+    # Ubuntu
+    service libvirt-bin stop
+    update-rc.d libvirt-bin disable
 
 Kolla deploys OpenStack using
 `Ansible <http://www.ansible.com>`__. Install Ansible from distribution
@@ -177,6 +196,17 @@ pip:
 
     pip install -U ansible
 
+Some ansible dependencies, like pycrypto, may need gcc installed on the build
+system. Install it using system packaging tools if it's not installed already:
+
+::
+
+    # Centos 7
+    yum -y install gcc
+
+    # Ubuntu
+    sudo apt-get install gcc
+
 Building Container Images
 --------------------------
 
@@ -193,7 +223,7 @@ or the build process will fail. To build images using default parameters run:
 
 ::
 
-    tools/build.py
+    kolla-build
 
 By default docker will build all containers using Centos as base image and
 binary installation as base installation method. To change this behavior,
@@ -216,13 +246,13 @@ rebuilt as follows:
 
 ::
 
-    tools/build.py glance
+    kolla-build glance
 
 In order to see all available parameters, run:
 
 ::
 
-    tools/build.py -h
+    kolla-build -h
 
 Deploying Kolla
 ---------------
@@ -238,8 +268,7 @@ Each method is represented as an Ansible inventory file. More information on the
 Ansible inventory file can be found in the Ansible `inventory introduction
 <https://docs.ansible.com/intro_inventory.html>`__.
 
-Copy the etc/kolla directory from the git to /etc/kolla on the deployment
-host. All variables for the environment can be specified in the files:
+All variables for the environment can be specified in the files:
 "/etc/kolla/globals.yml" and "/etc/kolla/passwords.yml"
 
 Start by editing /etc/kolla/globals.yml. Check and edit, if needed, these
@@ -303,13 +332,13 @@ wrapped in the kolla-script in the future.
 
 ::
 
-    tools/kolla-ansible deploy
+    kolla-ansible deploy
 
 In order to see all available parameters, run:
 
 ::
 
-    tools/kolla-ansible -h
+    kolla-ansible -h
 
 A bare metal system with Ceph takes 18 minutes to deploy. A virtual machine
 deployment takes 25 minutes. These are estimates; different hardware may be
@@ -328,7 +357,7 @@ glance image and neutron networks:
 
 ::
 
-    tools/init-runonce
+    kolla/tools/init-runonce
 
 Debugging Kolla
 ---------------