stackforge-attic/murano-docs
Code Issues Proposed changes

Resolve some issuies with new documentation

Browse Source 
Change-Id: Iddfabe30dd869cf24e14b27e9e02c97fb29acd2a
This commit is contained in:
Ekaterina Fedorova
2013-09-11 17:13:26 +04:00
parent 295cb5412f
commit a3b88489b0
5 changed files with 108 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/getting-started/src/docbkx/content/before_you_begin.xml
View File

@@ -40,7 +40,7 @@
<para><emphasis role="bold"> Use Appropriate Branch</emphasis></para> <para><emphasis role="bold"> Use Appropriate Branch</emphasis></para>
<para>There are a few branches that can be found in all Murano repositories: master, release-0.1, <para>There are a few branches that can be found in all Murano repositories: master, release-0.1,
release-0.2 and so on. Branch master is the most recent between the releases, but not as stable as release-x.x branches.</para> release-0.2 and so on. Branch master is the most recent between the releases, but not as stable as release-x.x branches.</para>
<para><emphasis role="bold">Use Separate vHost in <link linkend="Rabbit"></link>RabbitMQ</emphasis></para> <para><emphasis role="bold">Use Separate vHost in <link linkend="Rabbit">RabbitMQ</link></emphasis></para>
<para> <para>
In general it is OK to configure Murano services to use the root (‘/’) vHost in RabbitMQ and use the same user credentials as OpenStack services use. In general it is OK to configure Murano services to use the root (‘/’) vHost in RabbitMQ and use the same user credentials as OpenStack services use.
However, we recommend to create a separate vHost with separate user for each Murano devbox. There are a few reasons for that: However, we recommend to create a separate vHost with separate user for each Murano devbox. There are a few reasons for that:

81
src/getting-started/src/docbkx/content/setup_devbox.xml
View File

@@ -153,7 +153,8 @@ LAB_HOST='***.***.***.***'
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<programlisting> <programlisting>
># cd /opt/git># git clone git://github.com/stackforge/murano-deployment.git ># cd /opt/git
># git clone git://github.com/stackforge/murano-deployment.git
</programlisting> </programlisting>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
@@ -252,23 +253,27 @@ BRANCH_NAME='release-0.2'
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>Install the component</para> <para>Install the component</para>
<para>
<emphasis>Ubuntu</emphasis>
</para>
<programlisting>
># murano-api/setup.sh install
</programlisting>
<para>
<emphasis>CentOS</emphasis>
</para>
<programlisting>
># murano-api/setup-centos.sh install
</programlisting>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<programlisting>
># murano-api/setup.sh install
</programlisting>
<itemizedlist>
<listitem/>
</itemizedlist>
<programlisting>
># murano-api/setup-centos.sh install
</programlisting>
<para>Configuration:</para> <para>Configuration:</para>
<programlisting> <programlisting>
># cd /etc/murano-api &amp;&amp; cp murano-api-paste.ini.sample \ ># cd /etc/murano-api &amp;&amp; cp murano-api-paste.ini.sample \
murano-api-paste.ini murano-api-paste.ini
># cd /etc/murano-api &amp;&amp; cp murano-api.conf.sample murano-api.conf ># cd /etc/murano-api &amp;&amp; cp murano-api.conf.sample murano-api.conf
</programlisting> </programlisting>
<note> <note>
<para> <para>
Before start service, set proper configuration values in Before start service, set proper configuration values in
@@ -298,19 +303,20 @@ BRANCH_NAME='release-0.2'
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>Install the component</para> <para>Install the component</para>
</listitem> <para>
</itemizedlist> <emphasis>Ubuntu</emphasis>
<programlisting> </para>
<programlisting>
># murano-conductor/setup.sh install ># murano-conductor/setup.sh install
</programlisting> </programlisting>
<itemizedlist> <para>
<listitem> <emphasis>CentOS</emphasis>
<para><emphasis>on CentOS</emphasis></para> </para>
<programlisting>
># murano-conductor/setup-centos.sh install
</programlisting>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<programlisting>
># murano-conductor/setup-centos.sh install
</programlisting>
<para>Configuration</para> <para>Configuration</para>
<programlisting> <programlisting>
># cd /etc/murano-conductor &amp;&amp; cp \ ># cd /etc/murano-conductor &amp;&amp; cp \
@@ -339,9 +345,8 @@ BRANCH_NAME='release-0.2'
<para>How-to do this:</para> <para>How-to do this:</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para><emphasis>On Ubuntu</emphasis></para> <para><emphasis>Ubuntu</emphasis></para>
</listitem>
</itemizedlist>
<programlisting> <programlisting>
># apt-get install -y memcached libapache2-mod-wsgi openstack-dashboard ># apt-get install -y memcached libapache2-mod-wsgi openstack-dashboard
># dpkg --purge openstack-dashboard-ubuntu-theme # optional step ># dpkg --purge openstack-dashboard-ubuntu-theme # optional step
@@ -349,12 +354,10 @@ BRANCH_NAME='release-0.2'
<para>After installation is complete, openstack dashboard should be <para>After installation is complete, openstack dashboard should be
available at: http://&lt;your VM IP>/horizon available at: http://&lt;your VM IP>/horizon
</para> </para>
<itemizedlist>
<listitem>
<para><emphasis>on CentOS</emphasis></para>
</listitem> </listitem>
</itemizedlist> <listitem>
<programlisting> <para><emphasis>CentOS</emphasis></para>
<programlisting>
># yum install python-netaddr.noarch \ ># yum install python-netaddr.noarch \
python-keystoneclient.noarch \ python-keystoneclient.noarch \
python-django-horizon.noarch \ python-django-horizon.noarch \
@@ -362,31 +365,31 @@ BRANCH_NAME='release-0.2'
 httpd.x86_64 mod_wsgi.x86_64 \  httpd.x86_64 mod_wsgi.x86_64 \
openstack-dashboard.noarch --assumeyes openstack-dashboard.noarch --assumeyes
># chkconfig httpd on ># chkconfig httpd on
</programlisting> </programlisting>
<para>After installation is complete, openstack dashboard should be available <para>After installation is complete, openstack dashboard should be available
at: http://&lt;your VM IP>/dashboard at: http://&lt;your VM IP>/dashboard
</para> </para>
<para>Installation of the murano-dashboard is described below.</para> </listitem>
</itemizedlist>
<para>Installation of the murano-dashboard described below.</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>Get source code</para> <para>Get source code</para>
</listitem>
</itemizedlist>
<programlisting> <programlisting>
># git clone https://github.com/stackforge/murano-dashboard ># git clone https://github.com/stackforge/murano-dashboard
-b release-0.2 -b release-0.2
># chmod +x murano-dashboard/setup*.sh ># chmod +x murano-dashboard/setup*.sh
</programlisting> </programlisting>
<itemizedlist> </listitem>
<listitem> <listitem>
<para>Install the component</para> <para>Install the component</para>
<para><emphasis>On Ubuntu</emphasis> <para><emphasis>Ubuntu</emphasis>
<programlisting> <programlisting>
># murano-dashboard/setup.sh install ># murano-dashboard/setup.sh install
</programlisting> </programlisting>
</para> </para>
<para> <para>
<emphasis>on CentOS</emphasis> <emphasis>CentOS</emphasis>
<programlisting> <programlisting>
># murano-dashboard/setup-centos.sh install ># murano-dashboard/setup-centos.sh install
</programlisting> </programlisting>

79
src/getting-started/src/docbkx/content/setup_lab_environment.xml
View File

@@ -187,8 +187,55 @@
</programlisting> </programlisting>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>Add files to the folder structure under <para>Download and put the following files into the specified paths under
/opt/samba/share folder: <filename>/opt/samba/share</filename> folder:
<orderedlist>
<listitem>
<para>
<link xlink:href="http://www.asp.net/mvc/mvc4">
ASP .NET MVC 4 setup package</link>:
<filename>Prerequisites/AspNetMVC4Setup.exe</filename>
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://www.dropbox.com/sh/zthldcxnp6r4flm/Y8gxbIZGF_/WebApplications.exe">
Additional files to build ASP application
</link>: should be placed to <filename>Prerequisites/WebApplications.exe</filename>
</para>
</listitem>
<listitem>
<para>
<link xlink:href="http://www.microsoft.com/en-us/download/details.aspx?id=29066">
MS SQL Server 2012</link>: Extract the content of the ISO/EXE file
to the <filename>Prerequisites/SQL Server/2012/</filename>.
After that <filename>setup.exe</filename> should be located inside this directory.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="http://go.microsoft.com/fwlink/?LinkID=239656&amp;clcid=0x409">
Microsoft® Windows PowerShell Extensions for Microsoft® SQL Server®2012</link>:
<filename>Prerequisites/SQL Server/Tools/PowerShellTools.msi</filename>
</para>
</listitem>
<listitem>
<para>
<link xlink:href="http://go.microsoft.com/fwlink/?LinkID=239659&amp;clcid=0x409">
Microsoft® SQL Server® 2012 Shared
Management Objects</link>:
<filename>Prerequisites/SQL Server/Tools/SharedManagementObjects.msi</filename>
</para>
</listitem>
<listitem>
<para>
<link xlink:href="http://www.asp.net/mvc/mvc4">
Microsoft® System CLR Types for Microsoft® SQL Server® 2012
</link>:
<filename>Prerequisites/SQL Server/Tools/SQLSysClrTypes.msi</filename>
</para>
</listitem>
</orderedlist>
</para> </para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
@@ -236,7 +283,7 @@
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para> <para>
Download and put the following files to the specified paths under Download and put the following files into the specified paths under
<filename>/opt/image-builder </filename>folder: <filename>/opt/image-builder </filename>folder:
<orderedlist> <orderedlist>
<listitem> <listitem>
@@ -382,24 +429,24 @@
<listitem> <listitem>
<para> <para>
Import the Windows Server 2012 image into Glance Import the Windows Server 2012 image into Glance
<programlisting> </para>
</listitem>
</itemizedlist>
<programlisting>
>$ cd /opt/image-builder/share/images >$ cd /opt/image-builder/share/images
>$ glance image-create --name ws-2012-std --disk-format qcow2 \ >$ glance image-create --name ws-2012-std --disk-format qcow2 \
--container-type bare --file ws-2012-std.qcow2 \ --container-type bare --file ws-2012-std.qcow2 \
--is-public true \ --is-public true \
--property murano_image_info='{"type":"ws-2012-std",\ --property murano_image_info='{"type":"ws-2012-std",\
"title":"Windows Server 2012 Standard"}' "title":"Windows Server 2012 Standard"}'
</programlisting> </programlisting>
</para> <warning>
<warning> <para>
<para> The value of the --property argument named
The value of the --property argument named murano_image_info is a JSON string. Only double quotes are
murano_image_info is a JSON string. Only double quotes are valid in JSON, so please type the string exactly as in the
valid in JSON, so please type the string exactly as in the example above.
example above. </para>
</para> </warning>
</warning>
</listitem>
</itemizedlist>
</section> </section>
</chapter> </chapter>

2
src/user-guide/src/docbkx/content/murano-dashboard.xml
View File

@@ -51,7 +51,7 @@
<title>Creating service prototype</title> <title>Creating service prototype</title>
<para > <para >
All services should be created in the context of Environment All services should be created in the context of Environment
- virtual Windows Data Center. After Environment is created services prototypes - virtual Windows Data Center. After Environment is created, you need to create services prototypes
and then deploy the Environment. When deploy process is done instances and then deploy the Environment. When deploy process is done instances
with your services will be spawned in Openstack. with your services will be spawned in Openstack.
To create a service prototype navigate to environment services by To create a service prototype navigate to environment services by

2
src/user-guide/src/docbkx/style/user-guide.css
View File

@@ -29,7 +29,7 @@ body {
display: block; display: block;
padding: 10px; padding: 10px;
border: 1px solid #bbb; border: 1px solid #bbb;
background-color: #BDBDBD; background-color: #eee;
color: #000; color: #000;
overflow: auto; overflow: auto;
border-radius: 2.5px; border-radius: 2.5px;