Cherry pick following commits from master:

Change path to css file from absolute to relative
Resolve some issuies with new documentation
Exclude Mirantis name from our documentation
Remove ending space fom the link
Resolved typos and minor fixes to new documantation
Update active directory image
Make commands executable

Change-Id: I2923e9a4edae348a1381b167b3016da5a9e828a0
This commit is contained in:
Ekaterina Fedorova 2013-09-11 13:23:59 +04:00
parent 37402e3cd0
commit 215a89eab5
13 changed files with 169 additions and 119 deletions

View File

@ -24,21 +24,17 @@
<info>
<title>Murano Administrator's Guide</title>
<author>
<personname>
<firstname/>
<surname/>
</personname>
<affiliation>
<orgname>Mirantis, Inc.</orgname>
<orgname></orgname>
</affiliation>
</author>
<copyright>
<year>2013</year>
<holder>Mirantis, Inc.</holder>
<year></year>
<holder></holder>
</copyright>
<releaseinfo>v0.2</releaseinfo>
<productname>Murano</productname>
<pubdate>2013-09-05</pubdate>
<productname>Murano</productname>
<pubdate>2013-09-09</pubdate>
<legalnotice role="apache2">
<annotation>
<remark> Copyright details are filled in by the template. Change the value of the

View File

@ -25,21 +25,13 @@
<title>Murano Developers Guide</title>
<info>
<author>
<personname>
<firstname/>
<surname/>
</personname>
<affiliation>
<orgname>Mirantis, Inc.</orgname>
<orgname></orgname>
</affiliation>
</author>
<copyright>
<year>2013</year>
<holder>Mirantis, Inc.</holder>
</copyright>
<releaseinfo>v0.1</releaseinfo>
<productname>Murano™</productname>
<pubdate>2013-09-04</pubdate>
<releaseinfo>v0.2</releaseinfo>
<productname>Murano</productname>
<pubdate>2013-09-09</pubdate>
<legalnotice role="apache2">
<annotation>
<remark>Copyright details are filled in by the template. Change

View File

@ -38,12 +38,20 @@
</execution>
</executions>
<configuration>
<htmlCustomization>${basedir}/src/docbkx/style/config.xsl
<htmlCustomization>../style/config.xsl
</htmlCustomization>
<htmlStylesheet>${basedir}/src/docbkx/style/getting-started.css
<htmlStylesheet>../style/getting-started.css
</htmlStylesheet>
<xincludeSupported>true</xincludeSupported>
<chunkSectionDepth>100</chunkSectionDepth>
<postProcess>
<copy todir="target/docbkx/webhelp/getting-started/style">
<fileset dir="src/docbkx/style">
<include name="**/*.css"/>
<include name="**/*.xsl"/>
</fileset>
</copy>
</postProcess>
</configuration>
</plugin>
</plugins>

View File

@ -40,7 +40,7 @@
<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,
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>
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:

View File

@ -44,7 +44,7 @@
</note>
<section>
<title>Vagrant Way</title>
<para>The simplest way to get working Murano devbox is Vagrant tool.</para>
<para>The simplest way to get working Murano devbox is Vagrant tool. This tool is available for Ubuntu only.</para>
<para><emphasis role="bold">Prepare Environment (Ubuntu)</emphasis></para>
<itemizedlist>
<listitem>
@ -153,7 +153,8 @@ LAB_HOST='***.***.***.***'
</listitem>
</itemizedlist>
<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>
<itemizedlist>
<listitem>
@ -252,23 +253,27 @@ BRANCH_NAME='release-0.2'
<itemizedlist>
<listitem>
<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>
</itemizedlist>
<programlisting>
># murano-api/setup.sh install
</programlisting>
<itemizedlist>
<listitem/>
</itemizedlist>
<programlisting>
># murano-api/setup-centos.sh install
</programlisting>
<para>Configuration:</para>
<programlisting>
># cd /etc/murano-api &amp;&amp; cp murano-api-paste.ini.sample \
murano-api-paste.ini
># cd /etc/murano-api &amp;&amp; cp murano-api.conf.sample murano-api.conf
</programlisting>
</programlisting>
<note>
<para>
Before start service, set proper configuration values in
@ -298,19 +303,20 @@ BRANCH_NAME='release-0.2'
<itemizedlist>
<listitem>
<para>Install the component</para>
<para>
<emphasis>Ubuntu</emphasis>
</para>
<programlisting>
># ./murano-conductor/setup.sh install
</programlisting>
<para>
<emphasis>CentOS</emphasis>
</para>
<programlisting>
># ./murano-conductor/setup-centos.sh install
</programlisting>
</listitem>
</itemizedlist>
<programlisting>
># murano-conductor/setup.sh install
</programlisting>
<itemizedlist>
<listitem>
<para><emphasis>on CentOS</emphasis></para>
</listitem>
</itemizedlist>
<programlisting>
># murano-conductor/setup-centos.sh install
</programlisting>
<para>Configuration</para>
<programlisting>
># cd /etc/murano-conductor &amp;&amp; cp \
@ -339,9 +345,8 @@ BRANCH_NAME='release-0.2'
<para>How-to do this:</para>
<itemizedlist>
<listitem>
<para><emphasis>On Ubuntu</emphasis></para>
</listitem>
</itemizedlist>
<para><emphasis>Ubuntu</emphasis></para>
<programlisting>
># apt-get install -y memcached libapache2-mod-wsgi openstack-dashboard
># 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
available at: http://&lt;your VM IP>/horizon
</para>
<itemizedlist>
<listitem>
<para><emphasis>on CentOS</emphasis></para>
</listitem>
</itemizedlist>
<programlisting>
<listitem>
<para><emphasis>CentOS</emphasis></para>
<programlisting>
># yum install python-netaddr.noarch \
python-keystoneclient.noarch \
python-django-horizon.noarch \
@ -362,33 +365,33 @@ BRANCH_NAME='release-0.2'
 httpd.x86_64 mod_wsgi.x86_64 \
openstack-dashboard.noarch --assumeyes
># chkconfig httpd on
</programlisting>
<para>After installation is complete, openstack dashboard should be available
at: http://&lt;your VM IP>/dashboard
</para>
<para>Installation of the murano-dashboard is described below.</para>
</programlisting>
<para>After installation is complete, openstack dashboard should be available
at: http://&lt;your VM IP>/dashboard
</para>
</listitem>
</itemizedlist>
<para>Installation of the murano-dashboard described below.</para>
<itemizedlist>
<listitem>
<para>Get source code</para>
</listitem>
</itemizedlist>
<programlisting>
># git clone https://github.com/stackforge/murano-dashboard
-b release-0.2
># chmod +x murano-dashboard/setup*.sh
</programlisting>
<itemizedlist>
</listitem>
<listitem>
<para>Install the component</para>
<para><emphasis>On Ubuntu</emphasis>
<para><emphasis>Ubuntu</emphasis>
<programlisting>
># murano-dashboard/setup.sh install
># ./murano-dashboard/setup.sh install
</programlisting>
</para>
<para>
<emphasis>on CentOS</emphasis>
<emphasis>CentOS</emphasis>
<programlisting>
># murano-dashboard/setup-centos.sh install
># ./murano-dashboard/setup-centos.sh install
</programlisting>
</para>
</listitem>

View File

@ -143,7 +143,7 @@
</itemizedlist>
<programlisting>
># mkdir -p /opt/samba/share
>#chown nobody:nogroup /opt/samba/share
># chown nobody:nogroup /opt/samba/share
</programlisting>
<itemizedlist>
<listitem>
@ -171,7 +171,8 @@
</listitem>
</itemizedlist>
<programlisting>
># restart smbd># restart nmdb
># restart smbd
># restart nmdb
</programlisting>
</para>
<para><emphasis role="bold">Copy Prerequisites Into The Share</emphasis></para>
@ -187,8 +188,55 @@
</programlisting>
<itemizedlist>
<listitem>
<para>Add files to the folder structure under
/opt/samba/share folder:
<para>Download and put the following files into the specified paths under
<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>
</listitem>
</itemizedlist>
@ -236,7 +284,7 @@
<itemizedlist>
<listitem>
<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:
<orderedlist>
<listitem>
@ -320,7 +368,7 @@
</listitem>
<listitem>
<para>
<link xlink:href="https://www.dropbox.com/sh/zthldcxnp6r4flm/-k1Om_V6XR ">
<link xlink:href="https://www.dropbox.com/sh/zthldcxnp6r4flm/-k1Om_V6XR">
Murano Agent
</link>
share/files/MuranoAgent.zip
@ -382,24 +430,24 @@
<listitem>
<para>
Import the Windows Server 2012 image into Glance
<programlisting>
</para>
</listitem>
</itemizedlist>
<programlisting>
>$ 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 \
--property murano_image_info='{"type":"ws-2012-std",\
"title":"Windows Server 2012 Standard"}'
</programlisting>
</para>
<warning>
<para>
The value of the --property argument named
murano_image_info is a JSON string. Only double quotes are
valid in JSON, so please type the string exactly as in the
example above.
</para>
</warning>
</listitem>
</itemizedlist>
</programlisting>
<warning>
<para>
The value of the --property argument named
murano_image_info is a JSON string. Only double quotes are
valid in JSON, so please type the string exactly as in the
example above.
</para>
</warning>
</section>
</chapter>

View File

@ -25,21 +25,13 @@
<title>Murano Getting Started Guide</title>
<info>
<author>
<personname>
<firstname/>
<surname/>
</personname>
<affiliation>
<orgname>Mirantis, Inc.</orgname>
<orgname></orgname>
</affiliation>
</author>
<copyright>
<year>2013</year>
<holder>Mirantis, Inc.</holder>
</copyright>
<releaseinfo>v0.1</releaseinfo>
<productname>Murano™</productname>
<pubdate>2013-09-04</pubdate>
<releaseinfo>v0.2</releaseinfo>
<productname>Murano</productname>
<pubdate>2013-09-09</pubdate>
<legalnotice role="apache2">
<annotation>
<remark>Copyright details are filled in by the template. Change

View File

@ -38,9 +38,9 @@
</execution>
</executions>
<configuration>
<htmlCustomization>${basedir}/src/docbkx/style/config.xsl
<htmlCustomization>../style/config.xsl
</htmlCustomization>
<htmlStylesheet>${basedir}/src/docbkx/style/user-guide.css
<htmlStylesheet>../style/user-guide.css
</htmlStylesheet>
<xincludeSupported>true</xincludeSupported>
<chunkSectionDepth>100</chunkSectionDepth>
@ -50,6 +50,12 @@
<include name="**/*.png"/>
</fileset>
</copy>
<copy todir="target/docbkx/webhelp/user-guide/style">
<fileset dir="src/docbkx/style">
<include name="**/*.css"/>
<include name="**/*.xsl"/>
</fileset>
</copy>
</postProcess>
</configuration>
</plugin>

View File

@ -38,12 +38,21 @@
</mediaobject>
<para>
First thing you need to do is to create an environment - virtual Windows Data Center which will contain different Windows services.
Navigate to the "Environments" page and click the "Create Environment". After setting name to your virtual environment it will be created.
To do this, navigate to the "Environments" page and click the "Create Environment". After setting name to your virtual environment it will be created.
</para>
<mediaobject>
<imageobject role="fo">
<imagedata fileref="../images/env_btn.png" scalefit="1"
width="100%" contentdepth="100%"/>
</imageobject>
</mediaobject>
<para>
Just created environment has status <emphasis>Ready to configure</emphasis>.
</para>
<mediaobject>
<imageobject role="fo">
<imagedata fileref="../images/env_btn.png" scalefit="1" width="100%" contentdepth="100%"/>
<imagedata fileref="../images/env_created.png" scalefit="1"
width="100%" contentdepth="100%"/>
</imageobject>
</mediaobject>
</section>
@ -51,11 +60,11 @@
<title>Creating service prototype</title>
<para >
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
with your services will be spawned in Openstack.
To create a service prototype navigate to environment services by
clicking on the environment name (or on the "Services" button) and click
To create a service prototype navigate to page with the list of environment services by
clicking on the environment name (or on the "Services" button) and then, click
the "Create Service" button.
</para>
<mediaobject>
@ -112,7 +121,7 @@
is a server-side Web application framework designed for Web
development to produce dynamic Web pages. Service is able
to install custom application onto one IIS Web Server. Murano installs
all needed components and make proper configuration.
all needed components and makes proper configuration.
</para>
</listitem>
<listitem>
@ -160,7 +169,7 @@
</para>
<mediaobject>
<imageobject role="fo">
<imagedata fileref="../images/ad.png" width="100%" contentdepth="100%" format="PDF" />
<imagedata fileref="../images/active_directory.png" width="100%" contentdepth="100%" format="PDF" />
</imageobject>
</mediaobject>
<para>
@ -474,7 +483,7 @@
</mediaobject>
<para>
As long as installation and configuration are in progress, environment
is in <emphasis>Deploying</emphasis> state. Depending on how many
is in <emphasis>Deploy in progress</emphasis> state. Depending on how many
services you are deploying or how many nodes in your cluster, process of spawning instances,
installation and post installation settings takes from 10 minutes up to one hour.
</para>
@ -543,7 +552,7 @@
<para>
Murano gives an opportunity to supplement already deployed environment.
Thus if you already deployed the Active Directory service and want to add
any other services just create desired service prototype and click the "Deploy Environment" button.
any other services just create desired service prototype and click the "Deploy This Environment" button.
During service prototype creation you can join this service to the existent Active Directory domain.
</para>
</section>
@ -649,7 +658,7 @@
<para><emphasis role="bold"> How to debug OpenStack Heat?</emphasis></para>
<para>
If you can execute Heat command via console interface - all good. It is
the most simple way to check Heat state on the node - jest execute CLI
the most simple way to check Heat state on the node - just execute CLI
command 'heat list'.
See more information about Heat in openstack wiki

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

View File

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

View File

@ -30,16 +30,12 @@
<surname/>
</personname>
<affiliation>
<orgname>Mirantis, Inc.</orgname>
<orgname></orgname>
</affiliation>
</author>
<copyright>
<year>2013</year>
<holder>Mirantis, Inc.</holder>
</copyright>
<releaseinfo>v0.1</releaseinfo>
<productname>Murano™</productname>
<pubdate>2013-09-04</pubdate>
<releaseinfo>v0.2</releaseinfo>
<productname>Murano</productname>
<pubdate>2013-09-09</pubdate>
<legalnotice role="apache2">
<annotation>
<remark>Copyright details are filled in by the template. Change