Resolve comments in installation chapters

Change-Id: I72cb2079e61898249e008de99db4cca03ec23484

src/administrators-guide/src/docbkx/content/general.xml

@@ -203,7 +203,7 @@ done
             </orderedlist>
         </section>
         <section>
-            <title>Baseline Bata</title>
+            <title>Baseline Data</title>
             <para>
                 The table below provides baseline data which we've got in our environment.
             </para>
@@ -284,32 +284,35 @@ done
     <section>
         <title>Install OpenStack</title>
         <para>
-            We use Devstack (<link xlink:href="http://devstack.org/">http://devstack.org/</link>) to build our lab environment.
+            Murano works great with Openstack packages installation as well as devstack installation.
-        </para>
+            For now we support Openstack Grizzly and working on Havana integration.
-        <para>
-            Devstack is a set of scripts to automate OpenStack installation using sources from Git repositories.
-            No packages are built and installed during this process, all OpenStack components are executed in separate consoles (via screen utility).
-        </para>
-        <para>
-            It is a great tool to quickly install and start to develop OpenStack on you server. However, it has a few caveats that should be kept in mind:
         </para>
         <itemizedlist>
             <listitem>
                 <para>
-                    Devstack scripts must be executed each time the host reboots. This also reset your OpenStack environment to it’s ‘just installed’ state.
+                    For Openstack Grizzly installation follow
+                    <link xlink:href="https://github.com/mseknibilel/OpenStack-Grizzly-Install-Guide">
+                        the documentation</link>. In addition to that
+                    <link xlink:href=" https://wiki.openstack.org/wiki/Heat">Heat</link> should be installed.
+                    Follow the link to setup Heat on
+                    <link xlink:href="http://openstack.redhat.com/Deploy_Heat_and_launch_your_first_Application">Ubuntu</link>
+                    and on <link xlink:href="http://docs.openstack.org/developer/heat/getting_started/on_ubuntu.html">CentOS</link>.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
-                    Multi-node configurations are not as easy in installation as single-node.
+                     For a  Devstack installation take a look at<link xlink:href="http://devstack.org/">
-                </para>
+                    this page</link>.
-            </listitem>
+                    <warning>
-        </itemizedlist>
+                        <para>Murano Dashboard component should be
-        <para>
+                            installed on a separate node in case of devstack installation</para>
-            Below are the general steps that required to install OpenStack using Devstack in a Single-node mode.
+                    </warning>
                 </para>
                  <para>
-            Use Devstack's guide to install single VM OpenStack (<link xlink:href="http://devstack.org/guides/single-vm.html"> http://devstack.org/guides/single-vm.html</link>)
+                    Use Devstack's guide to install single VM OpenStack (<link
+                xlink:href="http://devstack.org/guides/single-vm.html">
+                    http://devstack.org/guides/single-vm.html</link>)
                 </para>
                 <formalpara>
                     <title>localrc example</title>
@@ -343,6 +346,8 @@ LOGFILE=$SCREEN_LOGDIR/stack.sh.log
         <para>
             If you need to image builder only, then install only packages required to run <emphasis role="strong">KVM</emphasis> (see below).
         </para>
+        </listitem>
+    </itemizedlist>
 </section>
 <section>
         <title>Configure OpenStack</title>
@@ -351,8 +356,5 @@ LOGFILE=$SCREEN_LOGDIR/stack.sh.log
                 Additional OpenStack configuration usually doesn't required in case you've installed OpenStack with Devstack scripts.
             </para>
         </note>
-        <para>
-            To configure OpenStack is not a simple task and depends on various options (hardware configuration, network layout, and so on) and in general is out of scope of this document.
-        </para>
 </section>
 </chapter>

src/administrators-guide/src/docbkx/content/image-bulder.xml

@@ -725,7 +725,7 @@
                         <para> Replace <emphasis role="bold">&lt;IMAGE_METADATA></emphasis> with the
                                 following property string
                                 <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>
                                 where <itemizedlist>
                                     <listitem>

src/administrators-guide/src/docbkx/content/installation-guide.xml

@@ -430,7 +430,7 @@ rabbitmqctl set_permissions -p muranovhost muranouser ".*" ".*" ".*"
                             </listitem>
                             <listitem>
                                 <para>Another murano-api configuration file located at
-                                    <filename>./etc/murano-api-paste.ini
+                                    <filename>/etc/murano-api/murano-api-paste.ini
                                     </filename>
                                     not requires any changes.
                                 </para>
@@ -719,14 +719,14 @@ sudo su -
                     </note>
                     <para><emphasis>CentOS</emphasis></para>
                     <programlisting>
-yum install -y make gcc memcached python-memcached          \
+yum install make gcc memcached python-memcached          \
         mod_wsgi openstack-dashboard python-netaddr.noarch
                     </programlisting>
                     <para>
                         <emphasis>Ubuntu</emphasis>
                     </para>
                     <programlisting>
-apt-get install -y memcached libapache2-mod-wsgi openstack-dashboard
+apt-get install memcached libapache2-mod-wsgi openstack-dashboard
 dpkg --purge openstack-dashboard-ubuntu-theme
                     </programlisting>
                 </listitem>

src/developers-guide/src/docbkx/content/installation-guide.xml

@@ -22,23 +22,12 @@ limitations under the License.
          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"
          version="5.0">
-    <title>Installation Guide</title>
+    <title>Install Murano</title>
-    <para>This chapter describes manual installation and configuration of Murano services.</para>
+    <para>This chapter describes Murano services installation in virtual environment.</para>
     <para>Note that all Murano modules can be downloaded from
         <link xlink:href="https://launchpad.net/murano/">our page</link>
         on launchpad.
     </para>
-    <para>
-        <note>
-            <title>Automatic installation</title>
-            <para>
-            Murano can be installed in automatic way. Script will install all
-            necessary packages to your system. Find out more about this in
-            <link xlink:href='http://murano-docs.github.io/0.2/getting-started/content/ch04s02.html'>
-                Getting Started Guide</link>
-            </para>
-        </note>
-    </para>
     <section xml:id="prerequisites">
         <title>Pre-Requisites</title>
         <para>Murano supports the following operating systems:</para>
@@ -103,13 +92,13 @@ http://www.w3.org/1999/xlink http://www.w3.org/1999/xlink.xsd"
     <section xml:id="venv">
         <title>Installing with virtual environment</title>
         <para>
-            For local development, all Murano components can be installed in
+            For a local development, all Murano components can be installed in
             a virtual environment.
             </para>
             <itemizedlist>
                 <listitem>
                     <para>
-                        Install virtaulenv packege if you don't have one:
+                        Install virtualenv package if you don't have one:
                         <programlisting>
 sudo pip install virtualenv
                         </programlisting>
@@ -148,7 +137,9 @@ git clone https://github.com/stackforge/murano-dashboard
                             Execute a script in the <filename>tools</filename> directory
                                 to create virtual environment automatically:
                             <programlisting>
-$ python tools/install_venv.py
+$ python murano-api/tools/install_venv.py
+$ python murano-conductor/tools/install_venv.py
+$ python murano-dashboard/tools/install_venv.py
                             </programlisting>
                     </para>
                 </listitem>
@@ -209,7 +200,7 @@ $ python tools/install_venv.py
                         <programlisting>
 # cp muranodashboard/local/local_settings.py.example muranodashboard/local/local_settings.py
                         </programlisting>
-                        set the actual IP address of the OpenStack end-point.
+                        and set in just copied file the 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.
                     </para>
@@ -217,7 +208,7 @@ $ python tools/install_venv.py
                 <listitem>
                     <para>Run Murano API:
                         <programlisting>
-./tools/with_venv.sh python api/cmd/api.py --config-file=./etc/murano-api.conf
+./tools/with_venv.sh python muranoapi/cmd/api.py --config-file=./etc/murano-api.conf
                         </programlisting>
                     </para>
                 </listitem>

src/getting-started/src/docbkx/content/setup_devbox.xml

@@ -99,8 +99,9 @@
         </programlisting>
         <itemizedlist>
             <listitem>
-                <para>IMPORTANT STEP: Edit the lab-binding.rc file - replace
+                <para>IMPORTANT STEP:  RabbitMQ credentials are specified to default in lab-binding.rc so don't forget to change them if necessary.
-                    all the markers ‘***’  to your settings. For example:
+                    For example: - replace all the markers ‘***’  to your settings:
+
                 </para>
             </listitem>
         </itemizedlist>

src/getting-started/src/docbkx/content/setup_lab_environment.xml

@@ -436,7 +436,7 @@
             <programlisting width="200">
 >$ 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     \
+    --container-format bare --file ws-2012-std.qcow2 --is-public true     \
     --property murano_image_info='{"type":"ws-2012-std", "title":"Windows Server 2012 Standard"}'
             </programlisting>
             <warning>