From 72219f0f8850e91edcfb58b4549ca001823844bb Mon Sep 17 00:00:00 2001
From: enthurohini <chaudhary.rohini241@gmail.com>
Date: Mon, 7 Sep 2015 15:35:33 +0530
Subject: [PATCH] Add cd, export and enable service command in doc

While installing the API service and Engine, sample configuration file
is needed to generate inside murano/murano using tox. Hence add cd
command.

While installing and running murano with devstack, environment
variable DEVSTACK_DIR is used. Add export command to set environment
varible. Neutron additional service is also required by murano which
do not come by default with devstack. It is mention and add command to
enable it.

Partial-Bug: #1492192
Change-Id: I84390a6e01a6b3300a6974c5f84b644c77f60825
---
 contrib/devstack/README.rst   | 12 +++++++++---
 doc/source/install/manual.rst |  2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/contrib/devstack/README.rst b/contrib/devstack/README.rst
index fbcb0f38e..38329085b 100644
--- a/contrib/devstack/README.rst
+++ b/contrib/devstack/README.rst
@@ -1,18 +1,24 @@
 1. Follow Devstack documentation to setup a host for Devstack. Then clone
    Devstack source code.
 
-2. Copy Murano integration scripts to Devstack::
+2. Copy Murano integration scripts to Devstack either by setting environment
+   variable or providing complete path to devstack directory. Below one is using
+   environment variable::
 
+      $ export DEVSTACK_DIR=<complete path to devstack directory(clonned)>
       $ cp lib/murano ${DEVSTACK_DIR}/lib
       $ cp lib/murano-dashboard ${DEVSTACK_DIR}/lib
       $ cp extras.d/70-murano.sh ${DEVSTACK_DIR}/extras.d
 
 3. Create a ``localrc`` file as input to devstack.
 
-4. The Murano services are not enabled by default, so they must be
-   enabled in ``localrc`` before running ``stack.sh``. This example ``localrc``
+4. The Murano, Neutron and Heat services are not enabled by default, so they must 
+   be enabled in ``localrc`` before running ``stack.sh``. This example ``localrc``
    file shows all of the settings required for Murano::
 
+      # Enable Neutron
+      ENABLED_SERVICES+=,q-svc,q-agt,q-dhcp,q-l3,q-meta,neutron
+
       # Enable Heat
       enable_service heat h-api h-api-cfn h-api-cw h-eng
 
diff --git a/doc/source/install/manual.rst b/doc/source/install/manual.rst
index 44d1162d1..34dd441dc 100644
--- a/doc/source/install/manual.rst
+++ b/doc/source/install/manual.rst
@@ -130,12 +130,14 @@ Install the API service and Engine
 
     .. code-block:: console
 
+	$ cd ~/murano/murano
         $ tox -e genconfig
     ..
 
     And make a copy of it for further modifications
 
     .. code-block:: console
+
         $ cd ~/murano/murano/etc/murano
         $ ln -s murano.conf.sample murano.conf
     ..