openstack/kolla-ansible
Code Issues Proposed changes

Fix the error in document

Browse Source 
Change-Id: I72e14bd2bb306498f5e010e8f9309e23243db00e
This commit is contained in:
zhuzeyu 2017-02-22 17:47:29 +08:00
parent d79c97eb26
commit 8da7dc30b2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/quickstart.rst
View File

@ -340,22 +340,22 @@ Copy the configuration files globals.yml and passwords.yml to /etc directory.
:: ::
#CentOS #CentOS
cp -r /usr/share/kolla/etc_examples/kolla /etc/kolla/ cp -r /usr/share/kolla-ansible/etc_examples/kolla /etc/kolla/
#Ubuntu #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 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. current directory.
:: ::
#CentOS #CentOS
cp /usr/share/kolla/ansible/inventory/* . cp /usr/share/kolla-ansible/ansible/inventory/* .
#Ubuntu #Ubuntu
cp /usr/local/share/kolla/ansible/inventory/* . cp /usr/local/share/kolla-ansible/ansible/inventory/* .
Install Kolla for development Install Kolla for development
============================= =============================
@ -653,11 +653,11 @@ with a glance image and neutron networks.
source /etc/kolla/admin-openrc.sh source /etc/kolla/admin-openrc.sh
#centOS #centOS
cd /usr/share/kolla cd /usr/share/kolla-ansible
./init-runonce ./init-runonce
#ubuntu #ubuntu
cd /usr/local/share/kolla cd /usr/local/share/kolla-ansible
./init-runonce ./init-runonce
.. note:: .. note::

4
doc/vagrant-dev-env.rst
View File

@ -140,11 +140,11 @@ Deploy **all-in-one** with::
Deploy multinode Deploy multinode
On Centos 7:: 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:: 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:: Validate OpenStack is operational::