Reordered links moving installation guide on top

Removed requirement to install into the /tmp dir
Scope of MRN-880
Change-Id: Id171e7d7dea916c8d3e506973d7294c38e0d1600
This commit is contained in:
Igor Marnat
2013-08-30 13:38:35 +04:00
parent 3af314b335
commit 6fc915dfd5
2 changed files with 10 additions and 16 deletions

View File

@@ -23,14 +23,14 @@
http://www.w3.org/1999/xlink http://www.w3.org/1999/xlink.xsd" http://www.w3.org/1999/xlink http://www.w3.org/1999/xlink.xsd"
version="5.0"> version="5.0">
<title>Installation Guide</title> <title>Installation Guide</title>
<para>This chapter is about installation and configuration Murano services.</para> <para>This chapter describes installation and configuration of Murano services.</para>
<para>Note that all Murano modules can be downloaded from <para>Note that all Murano modules can be downloaded from
<link xlink:href="https://launchpad.net/murano/">our page</link> <link xlink:href="https://launchpad.net/murano/">our page</link>
on launchpad. on launchpad.
</para> </para>
<section> <section>
<title>Common Pre-Requirements</title> <title>Pre-Requisites</title>
<para>Operation system:</para> <para>Murano supports the following operating systems:</para>
<orderedlist> <orderedlist>
<listitem> <listitem>
<para>Ubuntu</para> <para>Ubuntu</para>
@@ -39,7 +39,7 @@
<para>RHEL/CentOS</para> <para>RHEL/CentOS</para>
</listitem> </listitem>
</orderedlist> </orderedlist>
<para>Packages:</para> <para>Ensure that these packages are installed before Murano installation using your OS package manager:</para>
<orderedlist> <orderedlist>
<listitem> <listitem>
<para>python-dev</para> <para>python-dev</para>
@@ -59,14 +59,12 @@
<section> <section>
<title>Murano API Service</title> <title>Murano API Service</title>
<para>Murano API provides access to the Murano orchestration engine via API.</para> <para>Murano API provides access to the Murano orchestration engine via API.</para>
<para>This chapter describes Murano API for contributors of the project, and assumes that you are already <para>This chapter describes the procedure of installation and condiguration of Murano API. </para>
familiar with Murano API from an end-user perspective.
</para>
<section> <section>
<title>Install</title> <title>Install</title>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>Need to work as root</para> <para>We need to have superuser privileges in order to install and configure system packages. Let's switch to root account:</para>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
sudo su sudo su
@@ -74,14 +72,12 @@ sudo su
</programlisting> </programlisting>
</listitem> </listitem>
<listitem> <listitem>
<para>Navigate to the temporary directory and clone Murano API Service from repository</para> <para>Clone Murano API Service from repository</para>
<para> <para>
<emphasis>Ubuntu Linux 12.04 / 12.10</emphasis> <emphasis>Ubuntu Linux 12.04 / 12.10</emphasis>
</para> </para>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
mkdir -p /tmp/murano
cd /tmp/murano
apt-get install -y git apt-get install -y git
git clone https://github.com/stackforge/murano-api git clone https://github.com/stackforge/murano-api
]]> ]]>
@@ -91,8 +87,6 @@ git clone https://github.com/stackforge/murano-api
</para> </para>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
mkdir -p /tmp/murano
cd /tmp/murano
yum install -y git gcc python-paste-deploy python-routes yum install -y git gcc python-paste-deploy python-routes
git clone https://github.com/stackforge/murano-api git clone https://github.com/stackforge/murano-api
]]> ]]>
@@ -700,4 +694,4 @@ sh setup-centos.sh install
</section> </section>
</section> </section>
</section> </section>
</chapter> </chapter>

View File

@@ -22,7 +22,7 @@
xsi:schemaLocation="http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd xsi:schemaLocation="http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
http://www.w3.org/1999/xlink http://www.w3.org/1999/xlink.xsd" http://www.w3.org/1999/xlink http://www.w3.org/1999/xlink.xsd"
version="5.0"> version="5.0">
<title>Murano Project Documentation</title> <title>Murano User Guide</title>
<info> <info>
<author> <author>
<personname> <personname>
@@ -62,10 +62,10 @@
</cover> </cover>
</info> </info>
<xi:include href="./content/overview.xml" xlink:title="Overview" /> <xi:include href="./content/overview.xml" xlink:title="Overview" />
<xi:include href="./content/installation-guide.xml" xlink:title="Installation Guide" />
<xi:include href="./content/blueprint.xml" xlink:title="Blueprint" /> <xi:include href="./content/blueprint.xml" xlink:title="Blueprint" />
<xi:include href="./content/specification.xml" xlink:title="API Specification" /> <xi:include href="./content/specification.xml" xlink:title="API Specification" />
<xi:include href="./content/workflows.xml" xlink:title="Workflows XML DSL" /> <xi:include href="./content/workflows.xml" xlink:title="Workflows XML DSL" />
<xi:include href="./content/installation-guide.xml" xlink:title="Installation Guide" />
<xi:include href="./content/screenshots.xml" xlink:title="Screenshots" /> <xi:include href="./content/screenshots.xml" xlink:title="Screenshots" />
<xi:include href="./content/knownissues.xml" xlink:title="Known Issues" /> <xi:include href="./content/knownissues.xml" xlink:title="Known Issues" />
<chapter> <chapter>