stackforge-attic/murano-docs
Code Issues Proposed changes

Typos and style fixes.

Browse Source 
release-0.2 -> master

Added note about separate devbox.

Change-Id: I72c47ccea26cd943d8abf4cce2e28ab8df822bd4
This commit is contained in:
Dmitry Teselkin 2013-09-20 11:09:38 +04:00
parent 6d7b806126
commit 70f28b0030
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/administrators-guide/src/docbkx/administrators-guide.xml
View File

@ -168,7 +168,8 @@
Make 5 copies of Windows image file: Make 5 copies of Windows image file:
</para> </para>
<screen> <screen>
># for i in $(seq 5); do cp ws-2012-std.qcow2 ws-2012-std-$i.qcow2; done ># for i in $(seq 5); do \
cp ws-2012-std.qcow2 ws-2012-std-$i.qcow2; done
</screen> </screen>
</listitem> </listitem>
<listitem> <listitem>
@ -339,7 +340,7 @@ done
<formalpara> <formalpara>
<title>localrc example</title> <title>localrc example</title>
<para> <para>
<screen> <screen width="80">
HOST_IP= HOST_IP=
FLAT_INTERFACE= FLAT_INTERFACE=
FLOATING_RANGE= FLOATING_RANGE=
@ -353,7 +354,8 @@ SERVICE_TOKEN=tokentoken
ENABLED_SERVICES+=,heat,h-api,h-api-cfn,h-api-cw,h-eng ENABLED_SERVICES+=,heat,h-api,h-api-cfn,h-api-cw,h-eng
# Image's cache is in $TOP_DIR/files # Image's cache is in $TOP_DIR/files
IMAGE_URLS+=",http://fedorapeople.org/groups/heat/prebuilt-jeos-images/F17-x86_64-cfntools.qcow2" IMAGE_URLS+=",http://fedorapeople.org/groups/heat/prebuilt-jeos-images/"
IMAGE_URLS+="F17-x86_64-cfntools.qcow2"
# /etc/nova/nova.conf # /etc/nova/nova.conf
EXTRA_OPTS=(force_config_drive=true libvirt_images_type=qcow2 force_raw_images=false) EXTRA_OPTS=(force_config_drive=true libvirt_images_type=qcow2 force_raw_images=false)
@ -382,6 +384,9 @@ LOGFILE=$SCREEN_LOGDIR/stack.sh.log
</chapter> </chapter>
<chapter> <chapter>
<title>Install Murano Components</title> <title>Install Murano Components</title>
<para>This chapter describes how to install Murano components on a separate devbox. We
strongly recommend to use a separate host (virtual machine or real host) for Murano
devbox as it prevents you from various dependency conflicts.</para>
<section> <section>
<title>Automatic Installation</title> <title>Automatic Installation</title>
<para>There is a script to automate Murano installation onto devbox.<itemizedlist> <para>There is a script to automate Murano installation onto devbox.<itemizedlist>
@ -397,8 +402,8 @@ LOGFILE=$SCREEN_LOGDIR/stack.sh.log
<listitem> <listitem>
<para>Change directory to <emphasis role="bold">murano-deployment</emphasis> <para>Change directory to <emphasis role="bold">murano-deployment</emphasis>
and switch to required branch (e.g. <emphasis role="bold" and switch to required branch (e.g. <emphasis role="bold"
>release-0.2</emphasis>)<screen>># cd /opt/git/murano-deployment >master</emphasis>)<screen>># cd /opt/git/murano-deployment
># git checkout -b release-0.2 origin/release-0.2</screen></para> ># git checkout -b master origin/master</screen></para>
</listitem> </listitem>
<listitem> <listitem>
<para>Install <para>Install
@ -480,7 +485,7 @@ LOGFILE=$SCREEN_LOGDIR/stack.sh.log
<listitem> <listitem>
<para>Login to the Dashboard using URL <emphasis role="bold">http://&lt;your <para>Login to the Dashboard using URL <emphasis role="bold">http://&lt;your
VM IP>/dashboard</emphasis> or <emphasis role="bold">http://&lt;your VM IP>/dashboard</emphasis> or <emphasis role="bold">http://&lt;your
VM IP>/dashboard</emphasis></para> VM IP>/horizon</emphasis></para>
</listitem> </listitem>
</itemizedlist></para> </itemizedlist></para>
</section> </section>
@ -1199,7 +1204,7 @@ LOGFILE=$SCREEN_LOGDIR/stack.sh.log
<para> Replace <emphasis role="bold">&lt;IMAGE_METADATA></emphasis> with the <para> Replace <emphasis role="bold">&lt;IMAGE_METADATA></emphasis> with the
following property string following property string
<screen> <screen>
murano_image_info='{"title": "Windows 2012 Core Edition","type": "ws-2012-core"} murano_image_info='{"title": "Windows 2012 Core Edition", "type": "ws-2012-core"}
</screen> </screen>
where <itemizedlist> where <itemizedlist>
<listitem> <listitem>