From 80fd6785abdb963377b5920746bd26081e648cb2 Mon Sep 17 00:00:00 2001 From: Ekaterina Fedorova Date: Thu, 19 Sep 2013 19:26:52 +0400 Subject: [PATCH] Add installation from venv chapter Change-Id: I0ba51450abc310f6dd76c5e2238e308ab66e99ec --- src/administrators-guide/pom.xml | 8 + .../src/docbkx/administrators-guide.xml | 11 +- .../src/docbkx/style/administrators-guide.css | 41 +++++ .../src/docbkx/style/config.xsl | 10 ++ .../src/docbkx/content/installation-guide.xml | 158 +++++++++++++++++- .../src/docbkx/style/developers-guide.css | 15 -- .../docbkx/content/setup_lab_environment.xml | 2 +- 7 files changed, 216 insertions(+), 29 deletions(-) create mode 100644 src/administrators-guide/src/docbkx/style/administrators-guide.css create mode 100644 src/administrators-guide/src/docbkx/style/config.xsl diff --git a/src/administrators-guide/pom.xml b/src/administrators-guide/pom.xml index 5d1f9bb..96ad0aa 100644 --- a/src/administrators-guide/pom.xml +++ b/src/administrators-guide/pom.xml @@ -40,6 +40,14 @@ true 100 + + + + + + + + diff --git a/src/administrators-guide/src/docbkx/administrators-guide.xml b/src/administrators-guide/src/docbkx/administrators-guide.xml index 8b73ffb..71c3a4c 100644 --- a/src/administrators-guide/src/docbkx/administrators-guide.xml +++ b/src/administrators-guide/src/docbkx/administrators-guide.xml @@ -869,9 +869,11 @@ create mask = 0755 Use the glance image-create command to import your disk image to Glance: - >$ glance image-create --name <NAME> --is-public true \ - --disk-format qcow2 --container-format bare --file <IMAGE_FILE> \ - --property <IMAGE_METADATA> + >$ glance image-create --name <NAME> \ + --is-public true --disk-format qcow2 \ + --container-format bare \ + --file <IMAGE_FILE> \ + --property <IMAGE_METADATA> Replace the command line arguments to glance image-create with the @@ -932,7 +934,8 @@ create mask = 0755 Replace <IMAGE_METADATA> with murano_image_info property, - e.g.murano_image_info='{"title": "Windows 2012 Core Edition","type": "ws-2012-core"}' + e.g.murano_image_info='{"title": "Windows 2012 Core Edition",\ +"type": "ws-2012-core"}' diff --git a/src/administrators-guide/src/docbkx/style/administrators-guide.css b/src/administrators-guide/src/docbkx/style/administrators-guide.css new file mode 100644 index 0000000..d2e057e --- /dev/null +++ b/src/administrators-guide/src/docbkx/style/administrators-guide.css @@ -0,0 +1,41 @@ +img { + max-width: 100%; + width: auto; + height: auto; +} + body { + font-family: luxi sans,sans-serif; +} + +.programlisting ~ a, +.programlisting, +.screen { + font-family: monospace; + font-size: 1em; + display: block; + padding: 10px; + border: 1px solid #bbb; + background-color: #ddd; + color: #000; + overflow: auto; + border-radius: 2.5px; + -moz-border-radius: 2.5px; + margin: 0.5em 2em; +} + +a[href] { + text-decoration: none; + color: #0a5ba8; + } + +a[href]:hover { + text-decoration:underline +} + +a:visited { + color: #131580; + } + +a:active { + color: #0a5ba8; + } \ No newline at end of file diff --git a/src/administrators-guide/src/docbkx/style/config.xsl b/src/administrators-guide/src/docbkx/style/config.xsl new file mode 100644 index 0000000..234d628 --- /dev/null +++ b/src/administrators-guide/src/docbkx/style/config.xsl @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/src/developers-guide/src/docbkx/content/installation-guide.xml b/src/developers-guide/src/docbkx/content/installation-guide.xml index 6760cf2..e37bcc8 100644 --- a/src/developers-guide/src/docbkx/content/installation-guide.xml +++ b/src/developers-guide/src/docbkx/content/installation-guide.xml @@ -36,7 +36,7 @@ Getting Started Guide -
+
Pre-Requisites Murano supports the following operating systems: @@ -164,7 +164,7 @@ LOG:> Please, make proper configuration,located at "/etc/murano-api", before sta
-
+
Configure @@ -379,7 +379,7 @@ sh murano-conductor/setup-centos.sh install
-
+
Configure @@ -577,7 +577,7 @@ sh murano-dashboard/setup-centos.sh install
-
+
Configure @@ -617,13 +617,153 @@ sh murano-dashboard/setup-centos.sh install Check that "Environments" panel appears at the horizon "Project" tab. To see how to operate with Murano dashboard plugin check out - Murano User Guide + Murano User Guide.
+
+ Installing with virtual environment + + For local development, all Murano components can be installed in + a virtual environment. + + + + + Install virtaulenv packege if you don't have one: + +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 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 + + + + + + + + + + Config files for the development infrastructure of murano-api and murano-conductor can be found at etc + under folder with component repository. Follow the links to see how config files should be configured: + Murano API and Murano Conductor. + To configure Murano Dashboard copy + +# cp muranodashboard/local/local_settings.py.example muranodashboard/local/local_settings.py + + set 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 api/cmd/api.py --config-file=./etc/murano-api.conf + + + + + Run Murano Conductor: + +./tools/with_venv.sh python muranoconductor/cmd/run.py --config-file=./etc/conductor.conf + + + + + Run Murano Dashboard: + To start the Murano development server use the Django + manage.py utility with the context of the virtual + environment: + +./tools/with_venv.sh ./manage.py runserver 0.0.0.0:8080 + + + + +
SSL configuration @@ -639,10 +779,10 @@ sh murano-dashboard/setup-centos.sh install diff --git a/src/developers-guide/src/docbkx/style/developers-guide.css b/src/developers-guide/src/docbkx/style/developers-guide.css index 9a75122..d2e057e 100644 --- a/src/developers-guide/src/docbkx/style/developers-guide.css +++ b/src/developers-guide/src/docbkx/style/developers-guide.css @@ -7,21 +7,6 @@ img { font-family: luxi sans,sans-serif; } - { - font-family: monospace; - font-size: 1em; - display: block; - padding: 10px; - border: 1px solid #bbb; - background-color: #eee; - color: #000; - overflow: auto; - border-radius: 2.5px; - -moz-border-radius: 2.5px; - margin: 0.5em 2em; - -} - .programlisting ~ a, .programlisting, .screen { diff --git a/src/getting-started/src/docbkx/content/setup_lab_environment.xml b/src/getting-started/src/docbkx/content/setup_lab_environment.xml index f63d213..c281c2e 100644 --- a/src/getting-started/src/docbkx/content/setup_lab_environment.xml +++ b/src/getting-started/src/docbkx/content/setup_lab_environment.xml @@ -433,7 +433,7 @@ - + >$ cd /opt/image-builder/share/images >$ glance image-create --name ws-2012-std --disk-format qcow2 \ --container-type bare --file ws-2012-std.qcow2 --is-public true \