diff --git a/src/administrators-guide/src/docbkx/content/appendix.xml b/src/administrators-guide/src/docbkx/content/appendix.xml index 1d65ea9..d1ab096 100644 --- a/src/administrators-guide/src/docbkx/content/appendix.xml +++ b/src/administrators-guide/src/docbkx/content/appendix.xml @@ -90,10 +90,8 @@ deb http://archive.gplhost.com/debian grizzly-backports main Update system and add repositories and update OS -># yum install -y http://rdo.fedorapeople.org/openstack/\ - openstack-grizzly/rdo-release-grizzly.rpm -># yum install -y http://mirror.us.leaseweb.net/\ - epel/6/x86_64/epel-release-6-8.noarch.rpm +># yum install -y http://rdo.fedorapeople.org/openstack/openstack-grizzly/rdo-release-grizzly.rpm +># yum install -y http://mirror.us.leaseweb.net/epel/6/x86_64/epel-release-6-8.noarch.rpm ># yum install -y mc unzip git make gcc python-setuptools python-pip upstart ># yum update ># yum upgrade diff --git a/src/administrators-guide/src/docbkx/content/installation-guide.xml b/src/administrators-guide/src/docbkx/content/installation-guide.xml index 1efe2a7..ef94360 100644 --- a/src/administrators-guide/src/docbkx/content/installation-guide.xml +++ b/src/administrators-guide/src/docbkx/content/installation-guide.xml @@ -335,9 +335,7 @@ git clone https://github.com/stackforge/murano-api Stable version one of our releases can be checked by tag: - +cd murano-api && git checkout 0.2 @@ -347,7 +345,7 @@ git checkout 0.2 @@ -355,7 +353,7 @@ sh murano-api/setup.sh install @@ -383,13 +381,11 @@ LOG:> Please, make proper configuration,located at "/etc/murano-api", before sta cd /etc/murano-api cp murano-api.conf.sample murano-api.conf cp murano-api-paste.ini.sample murano-api-paste.ini - -vi murano-api.conf ]]> - Configure it according to your environment: + Configure murano-api.conf it according to your environment: [DEFAULT] section sets up logging. @@ -402,13 +398,10 @@ vi murano-api.conf - In - [rabbitmq] + In [rabbitmq] section you can set up host configuration where rabbitMQ - with just created user and vhost is running. - If you consider to use Murano in production it;sbetter to use seperate vhosts in RabbitMQ. - To add new vhost and user with - administrator rights preform: + with just created user and vhost is running. If you consider to use Murano in production it's better to use separate vhosts in RabbitMQ. + To add new vhost and user with administrator rights perform: - +cd murano-conductor && git checkout 0.2 @@ -550,7 +541,7 @@ git checkout 0.2 @@ -558,7 +549,7 @@ sh murano-conductor/setup.sh install @@ -699,7 +690,7 @@ sudo su - Make sure that additional repositories are installed and your system is updated and upgraded. - Please check from with steps in the appendix. + Please check from with steps in the appendix. @@ -710,11 +701,6 @@ sudo su - Horizon installed by devstack is not capable for a murano installation. - CentOS - -yum install make gcc memcached python-memcached \ - mod_wsgi openstack-dashboard python-netaddr.noarch - Ubuntu @@ -722,6 +708,13 @@ yum install make gcc memcached python-memcached \ apt-get install memcached libapache2-mod-wsgi openstack-dashboard dpkg --purge openstack-dashboard-ubuntu-theme + + CentOS + + +yum install make gcc memcached python-memcached \ +mod_wsgi openstack-dashboard python-netaddr.noarch + Clone Murano Dashboard repository from the github: @@ -737,7 +730,7 @@ git clone https://github.com/stackforge/murano-dashboard can be checked out by tag: -git checkout 0.2 +cd murano-dashboard && git checkout 0.2 @@ -747,7 +740,7 @@ git checkout 0.2 @@ -755,7 +748,7 @@ sh murano-dashboard/setup.sh install @@ -784,17 +777,17 @@ sh murano-dashboard/setup-centos.sh install - CentOS + Ubuntu -# service httpd restart +# service apache2 restart - Ubuntu + CentOS -# service apache2 restart + # service httpd restart diff --git a/src/developers-guide/src/docbkx/content/installation-guide.xml b/src/developers-guide/src/docbkx/content/installation-guide.xml index 4812bcc..b3db793 100644 --- a/src/developers-guide/src/docbkx/content/installation-guide.xml +++ b/src/developers-guide/src/docbkx/content/installation-guide.xml @@ -93,134 +93,80 @@ http://www.w3.org/1999/xlink http://www.w3.org/1999/xlink.xsd" For a local development, all Murano components can be installed in a virtual environment. - + First thing you need to do is to install check that + prerequisites are installed, system is updated and upgraded. + Next, install virtualenv package if you don't have one: + +sudo pip install virtualenv + + + Murano Api + + + + Check out git repository with murano component: + +git clone https://github.com/stackforge/murano-api + + + + + + Execute a script located at the murano-api/toolsdirectory + to create virtual environment automatically: + +cd murano-api && python ./tools/install_venv.py + + + + + + Config files are etc/murano-api.conf + where you just need to point out IP address where your RabbitMQ is + running, and etc/murano-api-paste.ini, which doesn't require any changes. + + + + And finally run Murano API: + +./tools/with_venv.sh python muranoapi/cmd/api.py --config-file=./etc/murano-api.conf + + + + + + + Murano Conductor - Install virtualenv package if you don't have one: + Check out git repository with murano component: -sudo pip install virtualenv - - - - - - Check out git repository with murano component: - - - - -git clone https://github.com/stackforge/murano-api - - - - git clone https://github.com/stackforge/murano-conductor - - - - -git clone https://github.com/stackforge/murano-dashboard - - - - - - - Make sure that required system packages are installed. - Check list from prerequisites page - - - - - Execute a script in the tools directory - to create virtual environment automatically: - -$ python murano-api/tools/install_venv.py -$ python murano-conductor/tools/install_venv.py -$ python murano-dashboard/tools/install_venv.py - + - For Murano Dashboard additional installation need to be done: - - - - Openstack dashboard (horizon).: - -./tools/with_venv.sh pip install https://github.com/openstack/horizon/archive/grizzly-2.tar.gz - - - - - - Install openstack-dashboard dependency: - - - - Ubuntu - -# apt-get install nodejs - - - - - - CentOS - -# yum install nodejs - - - - - - - - - - Customized Djblets package to support datagrid element (installation by pip is not supported): - -./tools/with_venv.sh easy_install https://github.com/tsufiev/djblets/archive/master.zip - - - - - + Execute a script located at the + murano-conductor/toolsdirectory + to create virtual environment automatically: + +cd murano-conductor && python ./tools/install_venv.py + - - Config files for the development infrastructure of murano-api and murano-conductor can be found at etc - under folder with component repository. In murano-api and murano-conductor config file (located under ./etc directory) - just point out IP address where your RabbitMQ is running. - For a murano-conductor local development comment data_dir parameter in ./etc/config.conf: + Murano Conductor config file located at etc/conductor.conf + For a local development comment data_dir parameter in this file: # Directory where conductor's data directory located. # "data" must be subdirectory to this. # data_dir = /etc/murano-conductor - After that local data directory, which contain all necessary files will be used. - All other possible configuration described in the Murano Admin Guide. - - - - - To configure Murano Dashboard copy - -# cp muranodashboard/local/local_settings.py.example muranodashboard/local/local_settings.py - - and set in just copied file the the actual IP address of the OpenStack end-point. - If you haven't register murano-api service in the keystone catalog you can set MURANO_API_URL in the same settings file. - Note that local murano-api service will be using by default. - - - - Run Murano API: - -./tools/with_venv.sh python muranoapi/cmd/api.py --config-file=./etc/murano-api.conf - + After that local data + directory, which contain all necessary files will be + used. All other possible configuration described in the Murano Admin Guide. @@ -230,7 +176,69 @@ $ python murano-dashboard/tools/install_venv.py - + + + + Murano Dashboard + + + + Check out git repository with murano component: + +git clone https://github.com/stackforge/murano-dashboard + + + + + + Execute a script located at the + murano-conductor/toolsdirectory + to create virtual environment automatically: + +cd murano-dashboard && python ./tools/install_venv.py + + + + + + Murano is a plugin for a Openstack dashboard. So need to install it and it's dependency: + + + + +# ./tools/with_venv.sh pip install https://github.com/openstack/horizon/archive/grizzly-2.tar.gz + + Ubuntu + +# apt-get install nodejs + + CentOS + +# yum install nodejs + + + + Customized Djblets package to support datagrid element (installation by pip is not supported): + +# ./tools/with_venv.sh easy_install https://github.com/tsufiev/djblets/archive/master.zip + + + + + + + + + To configure Murano Dashboard copy example config file: + +# cp muranodashboard/local/local_settings.py.example muranodashboard/local/local_settings.py + + and set in just copied file the the actual IP address of the OpenStack end-point. + If you haven't register murano-api service in the keystone catalog you can set MURANO_API_URL in the same settings file. + Note that local murano-api service will be using by default. + + + Run Murano Dashboard: To start the Murano development server use the Django manage.py utility with the context of the virtual