openstack
/
sahara
Code Issues Proposed changes

Merge "Docs improvements"

This commit is contained in:
Jenkins 2013-07-26 07:33:22 +00:00 committed by Gerrit Code Review
parent 591a5fe06f 74025fc5f1
commit b8b8e3e7d1
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/horizon/dev.environment.guide.rst
View File

@ -20,7 +20,7 @@ endpoints using the following command:
$ sudo apt-get update
$ sudo apt-get install git-core python-dev gcc python-setuptools python-virtualenv node-less
On Ubuntu 12.10 and higher you have to install the following lib as well:
On Ubuntu 12.10 and higher you have to install the following lib as well:
.. sourcecode:: console
@ -79,11 +79,11 @@ and set right value for variables:
$ .venv/bin/python $SAVANNA_DASHBOARD_HOME/setup.py install
8. Create a symlink to savannadashboard source
8. Create a symlink to savanna-dashboard source
.. sourcecode:: console
$ ln -s $SAVANNA_DASHBOARD_HOME/savannadashboard .venv/lib/python2.7/site-packages/savannadashboard
$ ln -s $SAVANNA_DASHBOARD_HOME/savanna-dashboard .venv/lib/python2.7/site-packages/savanna-dashboard
9. In ``openstack_dashboard/settings.py`` add savanna to

4
doc/source/horizon/installation.guide.rst
View File

@ -26,7 +26,7 @@ approach see :doc:`/horizon/dev.environment.guide`
.. sourcecode:: console
$ sudo pip install savannadashboard
$ sudo pip install savanna-dashboard
..
This will install latest stable release of Savanna UI. If you want to install master branch of Savanna UI:
@ -52,7 +52,7 @@ approach see :doc:`/horizon/dev.environment.guide`
....
..
Note: ``settings.py`` file is located in ``/usr/share/openstack_dashboard/openstack-dashboard/`` by default.
Note: ``settings.py`` file is located in ``/usr/share/openstack-dashboard/openstack_dashboard/`` by default.
3) Also you have to specify **SAVANNA_URL** in local_settings.py. For example:

9
doc/source/userdoc/installation.guide.rst
View File

@ -35,7 +35,7 @@ See :doc:`anti_affinity` for details. But that is purely optional.
$ sudo yum install gcc python-setuptools python-devel
$ sudo easy_install pip
$ sudo install virtualenv
$ sudo pip install virtualenv
2. Setup virtual environment for Savanna:
@ -60,7 +60,7 @@ See :doc:`anti_affinity` for details. But that is purely optional.
.. sourcecode:: console
$ savanna-venv/bin/pip install 'http://tarballs.openstack.org/savanna/savanna-master.tar.gz#egg=savanna'
$ savanna-venv/bin/pip install 'http://tarballs.openstack.org/savanna/savanna-master.tar.gz'
..
Note that savanna-master.tar.gz contains the latest changes and might not be stable at the moment.
@ -82,6 +82,11 @@ See :doc:`anti_affinity` for details. But that is purely optional.
$ savanna-venv/bin/python savanna-venv/bin/savanna-api --config-file savanna-venv/etc/savanna.conf
..
Note:
-----
Make sure that your operating system is not blocking Savanna port (default: 8386).
You may need to configure iptables in CentOS and some other operating systems.
To get the list of all possible options run:
.. sourcecode:: console