Merge "Fix the error in document"

doc/quickstart.rst

@@ -340,22 +340,22 @@ Copy the configuration files globals.yml and passwords.yml to /etc directory.
 ::
 
     #CentOS
-    cp -r /usr/share/kolla/etc_examples/kolla /etc/kolla/
+    cp -r /usr/share/kolla-ansible/etc_examples/kolla /etc/kolla/
 
     #Ubuntu
-    cp -r /usr/local/share/kolla/etc_examples/kolla /etc/kolla/
+    cp -r /usr/local/share/kolla-ansible/etc_examples/kolla /etc/kolla/
 
 The inventory files (all-in-one and multinode) are located in
-/usr/local/share/kolla/ansible/inventory. Copy the configuration files to the
+/usr/local/share/kolla-ansible/ansible/inventory. Copy the configuration files to the
 current directory.
 
 ::
 
    #CentOS
-   cp /usr/share/kolla/ansible/inventory/* .
+   cp /usr/share/kolla-ansible/ansible/inventory/* .
 
    #Ubuntu
-   cp /usr/local/share/kolla/ansible/inventory/* .
+   cp /usr/local/share/kolla-ansible/ansible/inventory/* .
 
 Install Kolla for development
 =============================
@@ -653,11 +653,11 @@ with a glance image and neutron networks.
     source /etc/kolla/admin-openrc.sh
 
     #centOS
-    cd /usr/share/kolla
+    cd /usr/share/kolla-ansible
     ./init-runonce
 
     #ubuntu
-    cd /usr/local/share/kolla
+    cd /usr/local/share/kolla-ansible
     ./init-runonce
 
 .. note::

doc/vagrant-dev-env.rst

@@ -140,11 +140,11 @@ Deploy **all-in-one** with::
 Deploy multinode
 On Centos 7::
 
-    sudo kolla-ansible deploy -i /usr/share/kolla/ansible/inventory/multinode
+    sudo kolla-ansible deploy -i /usr/share/kolla-ansible/ansible/inventory/multinode
 
 On Ubuntu 14.04 or later::
 
-    sudo kolla-ansible deploy -i /usr/local/share/kolla/ansible/inventory/multinode
+    sudo kolla-ansible deploy -i /usr/local/share/kolla-ansible/ansible/inventory/multinode
 
 Validate OpenStack is operational::