diff --git a/src/developers-guide/pom.xml b/src/developers-guide/pom.xml index a75b137..e068917 100644 --- a/src/developers-guide/pom.xml +++ b/src/developers-guide/pom.xml @@ -38,6 +38,8 @@ + ../style/config.xsl + ../style/developers-guide.css true 100 @@ -46,6 +48,12 @@ + + + + + + diff --git a/src/getting-started/src/docbkx/content/appendix.xml b/src/developers-guide/src/docbkx/content/appendix.xml similarity index 95% rename from src/getting-started/src/docbkx/content/appendix.xml rename to src/developers-guide/src/docbkx/content/appendix.xml index e24e62d..cccc328 100644 --- a/src/getting-started/src/docbkx/content/appendix.xml +++ b/src/developers-guide/src/docbkx/content/appendix.xml @@ -108,7 +108,7 @@ deb http://archive.gplhost.com/debian grizzly-backports main ># yum install -y http://rdo.fedorapeople.org/openstack/ openstack-grizzly/rdo-release-grizzly.rpm -># yum install -y http://mirror.yandex.ru/ +># yum install -y mirror.us.leaseweb.net/ epel/6/x86_64/epel-release-6-8.noarch.rpm ># yum update ># yum upgrade @@ -139,11 +139,9 @@ deb http://archive.gplhost.com/debian grizzly-backports main ># pip --version - How-to upgrade pip to latest version: + To upgrade pip to latest version use ># pip install --upgrade pip -># pip install - https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz @@ -153,7 +151,7 @@ deb http://archive.gplhost.com/debian grizzly-backports main - How to handle this situation: + To handle this situation: ># rm /usr/bin/pip ># ln -s /usr/local/bin/pip /usr/bin/pip diff --git a/src/developers-guide/src/docbkx/content/installation-guide.xml b/src/developers-guide/src/docbkx/content/installation-guide.xml index fae8c8a..e273ae6 100644 --- a/src/developers-guide/src/docbkx/content/installation-guide.xml +++ b/src/developers-guide/src/docbkx/content/installation-guide.xml @@ -23,11 +23,19 @@ http://www.w3.org/1999/xlink http://www.w3.org/1999/xlink.xsd" version="5.0"> Installation Guide - This chapter describes installation and configuration of Murano services. + This chapter describes manual installation and configuration of Murano services. Note that all Murano modules can be downloaded from our page on launchpad. + + + Automatic installation Murano can be installed in automatic way. Script will install all + necessary packages to your system. Find out more about this in + + Getting Started Guide + +
Pre-Requisites Murano supports the following operating systems: @@ -42,6 +50,12 @@ These system packages are required for Murano: Ubuntu + + gcc + + + python-pip + python-dev @@ -59,6 +73,12 @@ CentOS + + gcc + + + python-pip + python-devel @@ -72,6 +92,10 @@ libffi-devel + + All these packages will be installed in murano-installation scripts. In addition to these packages some repositories are required. + Please follow the instructions in the appendix to prepare your environment for murano installation. +
@@ -89,6 +113,10 @@ sudo su - ]]> + + Make sure that additional linux repositories are installed. See the appendix for information about preparing a virtual machine for murano installation. + + Clone Murano API git repository: @@ -120,7 +148,6 @@ sh setup.sh install @@ -309,6 +336,13 @@ sudo su - ]]> + + Make sure that additional repositories are installed. + See + the appendix + for information about preparing a virtual machine for murano installation. + + Clone Murano Conductor repository from the github. @@ -344,7 +378,6 @@ sh setup.sh install @@ -481,6 +514,27 @@ sudo su - ]]> + + Make sure that additional repositories are installed. + See the appendix + for information about preparing a virtual machine for murano installation. + + + + If there is no openstack dashboard package in your environment install it now with all dependencies: + CentOS + +yum install -y make gcc memcached python-memcached + mod_wsgi openstack-dashboard python-netaddr.noarch --assumeyes + + + Ubuntu + + +apt-get install -y memcached libapache2-mod-wsgi + openstack-dashboard + + Clone Murano Dashboard repository from the github: diff --git a/src/developers-guide/src/docbkx/developers-guide.xml b/src/developers-guide/src/docbkx/developers-guide.xml index 8e6a094..63f7d0e 100644 --- a/src/developers-guide/src/docbkx/developers-guide.xml +++ b/src/developers-guide/src/docbkx/developers-guide.xml @@ -75,4 +75,5 @@ xlink:href="https://launchpad.net/murano">launchpad page. + diff --git a/src/getting-started/src/docbkx/content/before_you_begin.xml b/src/getting-started/src/docbkx/content/before_you_begin.xml index 940500a..59ee239 100644 --- a/src/getting-started/src/docbkx/content/before_you_begin.xml +++ b/src/getting-started/src/docbkx/content/before_you_begin.xml @@ -135,8 +135,6 @@ backup your VM easily. Any type of hypervisor software which supports linux as guest OS could be used. KVM, VMWare and VirtualBox were tested with success. - There is a Murano VM Appendix - which contains steps to build your own VM. Supported OS diff --git a/src/getting-started/src/docbkx/content/setup_devbox.xml b/src/getting-started/src/docbkx/content/setup_devbox.xml index 1ce0379..bd2a73e 100644 --- a/src/getting-started/src/docbkx/content/setup_devbox.xml +++ b/src/getting-started/src/docbkx/content/setup_devbox.xml @@ -136,16 +136,13 @@ LAB_HOST='***.***.***.***'
Automated Way - - Build your VM using instructions from Murano VM first. - - Create a folder to hold cloned repositories + Create a folder to hold git repositories -># mkdir -p /opt/git +># mkdir -p /opt/git cd /opt/git && cd /opt/git @@ -153,7 +150,6 @@ LAB_HOST='***.***.***.***' -># cd /opt/git ># git clone git://github.com/stackforge/murano-deployment.git @@ -169,7 +165,7 @@ LAB_HOST='***.***.***.***' - Install prerequisites + Install prerequisites. On this step some additional system packages will be installed @@ -213,190 +209,6 @@ BRANCH_NAME='release-0.2'
-
- Manual Way - Build your VM using instructions from - Murano VM - first. - - - Package for Ubuntu and CentOS already in progress and will soon - be accessible for users. While they are not available, we provide - information about how to get and install all murano services from - source code below. We made setup scripts for automated installation - of our products which accepts install and uninstall command line - arguments. Service startup jobs are handled by Upstart. - - At first we need to create a working directory. - - All installation steps require the superuser rights. - -># mkdir -p /opt/git && cd /opt/git - - - - Please, track actual projects stable branch, at the time of - writing current stable branch is - release-0.2 - - - - Murano-Api - - - Get source code - - - -># git clone https://github.com/stackforge/murano-api -b release-0.2 -># chmod +x murano-api/setup*.sh - - - - Install the component - - - Ubuntu - - -># ./murano-api/setup.sh install - - - CentOS - - -># ./murano-api/setup-centos.sh install - - - - Configuration: - -># cd /etc/murano-api && cp murano-api-paste.ini.sample \ - murano-api-paste.ini -># cd /etc/murano-api && cp murano-api.conf.sample murano-api.conf - - - - Before start service, set proper configuration values in - configuration files mentioned above. - - - - Service control: - - -># start murano-api -># stop murano-api -># restart murano-api -># status murano-api - - Murano-Conductor - - - Get source code - - - -># git clone https://github.com/stackforge/murano-conductor \ - -b release-0.2 -># chmod +x murano-conductor/setup*.sh - - - - Install the component - - Ubuntu - - -># ./murano-conductor/setup.sh install - - - CentOS - - -># ./murano-conductor/setup-centos.sh install - - - - Configuration - -># cd /etc/murano-conductor && cp \ - conductor-paste.ini.sample conductor-paste.ini -># cd /etc/murano-conductor && cp \ - conductor.conf.sample conductor.conf - - - - Before starting the service, set proper configuration values in - configuration files mentioned above. - - - Service control: - -># start murano-conductor -># stop murano-conductor -># restart murano-conductor -># status murano-conductor - - - Murano-Dashboard - At first, Install OpenStack dashboard(Horizon)  and dependent - packages. - - How-to do this: - - - Ubuntu - - -># apt-get install -y memcached libapache2-mod-wsgi openstack-dashboard -># dpkg --purge openstack-dashboard-ubuntu-theme # optional step - - After installation is complete, openstack dashboard should be - available at: http://<your VM IP>/horizon - - - - CentOS - -># yum install python-netaddr.noarch \ - python-keystoneclient.noarch \ - python-django-horizon.noarch \ - python-django-openstack-auth.noarch \ -  httpd.x86_64 mod_wsgi.x86_64 \ - openstack-dashboard.noarch --assumeyes -># chkconfig httpd on - - After installation is complete, openstack dashboard should be available - at: http://<your VM IP>/dashboard - - - - Installation of the murano-dashboard described below. - - - Get source code - -># git clone https://github.com/stackforge/murano-dashboard - -b release-0.2 -># chmod +x murano-dashboard/setup*.sh - - - - Install the component - Ubuntu - -># ./murano-dashboard/setup.sh install - - - - CentOS - -># ./murano-dashboard/setup-centos.sh install - - - - -
Murano Services Configuration This chapter descrides how to configure Murano services diff --git a/src/getting-started/src/docbkx/getting-started.xml b/src/getting-started/src/docbkx/getting-started.xml index 782158c..0433b20 100644 --- a/src/getting-started/src/docbkx/getting-started.xml +++ b/src/getting-started/src/docbkx/getting-started.xml @@ -57,5 +57,4 @@ -