From 0a36133326cfe8836b81780cf0ff42ad4021a20f Mon Sep 17 00:00:00 2001
From: Bertrand Souville <souville@docomolab-euro.com>
Date: Mon, 2 Oct 2017 17:55:30 +0200
Subject: Update Config Guide

Change-Id: Ibac4f47889ec0d0349d29eaffb61bcf070d99eb3
Signed-off-by: Bertrand Souville <souville@docomolab-euro.com>
(cherry picked from commit b121b21df581291cd273a9a8acc1d4f266116022)
---
 docs/release/configguide/feature.configuration.rst |  27 ++++++++++++---------
 .../images/screenshot_promise_install.png          | Bin 77709 -> 216440 bytes
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/docs/release/configguide/feature.configuration.rst b/docs/release/configguide/feature.configuration.rst
index ad1df0e..3e66020 100644
--- a/docs/release/configguide/feature.configuration.rst
+++ b/docs/release/configguide/feature.configuration.rst
@@ -14,8 +14,9 @@ Install nodejs, npm and promise
     git clone https://gerrit.opnfv.org/gerrit/promise
     cd promise/source
     npm install
+    npm ls
 
-Please note that the last command 'npm install' will install all needed dependencies
+Please note that the last command 'npm ls' will list all needed dependencies
 for promise (including yangforge and mocha)
 
 .. figure:: images/screenshot_promise_install.png
@@ -29,23 +30,25 @@ Please perform the following preparation steps:
 
 1. Set OpenStack environment parameters properly (e.g. source openrc admin demo
    in DevStack)
-2. Create OpenStack tenant (e.g. promise) and tenant user (e.g. promiser)
+2. Create OpenStack project (e.g. promise) and user (e.g. myuser) in e.g. the
+   default domain
 3. Create a flavor in Nova with 1 vCPU and 512 MB RAM
 4. Create a private network, subnet and router in Neutron
 5. Create an image in Glance
 
-Once done, the promise test script can be invoked as follows (as a single line
-command):
+Once done, the promise test script can be invoked as follows:
 
 .. code-block:: bash
 
-   NODE_ENV=mytest \
-   OS_TENANT_NAME=promise \
-   OS_USERNAME=promiser \
-   OS_PASSWORD=<user password from Step 2> \
-   OS_TEST_FLAVOR=<flavor ID from Step 3> \
-   OS_TEST_NETWORK=<network ID from Step 4> \
-   OS_TEST_IMAGE=<image ID from Step 5> \
+   export OS_PROJECT_NAME=promise
+   export OS_TENANT_NAME=promise
+   export OS_PROJECT_DOMAIN_NAME=Default
+   export OS_USERNAME=myuser
+   export OS_USER_DOMAIN_NAME=Default
+   export OS_PASSWORD=<user password from Step 2>
+   export OS_TEST_FLAVOR=<flavor ID from Step 3>
+   export OS_TEST_NETWORK=<network ID from Step 4>
+   export OS_TEST_IMAGE=<image ID from Step 5>
    npm run -s test -- --reporter json > promise-results.json
 
 The results of the tests will be stored in the promise-results.json file.
@@ -57,4 +60,4 @@ The results can also be seen in the console ("npm run -s test")
    :width: 90%
 
 All 33 tests passing?!
-Congratulations, promise has been successfully installed and configured.
+Congratulations, Promise has been successfully installed and configured.
diff --git a/docs/release/configguide/images/screenshot_promise_install.png b/docs/release/configguide/images/screenshot_promise_install.png
index 2cb27d9..ab78994 100644
Binary files a/docs/release/configguide/images/screenshot_promise_install.png and b/docs/release/configguide/images/screenshot_promise_install.png differ
-- 
cgit 1.2.3-korg