Restore Proper Logging

Puts the logging.json file back into the correct path so that
the rest_server.py initializes the logging system correctly.

Adds the missing 'TAG=latest' to the documentation.

Change-Id: Id9caba86f6470136a7fe128a2fe1fb520133fc0b
JIRA: STORPERF-191
Signed-off-by: mbeierl <mark.beierl@dell.com>

diff --git a/docker/storperf-master/storperf/logging.json b/docker/storperf-master/logging.json
similarity index 100%
rename from docker/storperf-master/storperf/logging.json
rename to docker/storperf-master/logging.json

diff --git a/docs/testing/user/installation.rst b/docs/testing/user/installation.rst
index de7eeb7..8952f48 100755 (executable)
--- a/docs/testing/user/installation.rst
+++ b/docs/testing/user/installation.rst
@@ -145,15 +145,16 @@ which should result in:
 
 To run, you must specify two environment variables:
 
-* ENV_FILE, which points to your OpenStack admin.rc as noted above
+* ENV_FILE, which points to your OpenStack admin.rc as noted above.
 * CARBON_DIR, which points to a directory that will be mounted to store the raw metrics.
+* TAG, which specified the Docker tag for the build (ie: latest, danube.3.0, etc).
 
 The following command will start all the StorPerf services:
 
 .. code-block:: console
 
-     ENV_FILE=./admin.rc CARBON_DIR=./carbon/ docker-compose pull
-     ENV_FILE=./admin.rc CARBON_DIR=./carbon/ docker-compose up -d
+     TAG=latest ENV_FILE=./admin.rc CARBON_DIR=./carbon/ docker-compose pull
+     TAG=latest ENV_FILE=./admin.rc CARBON_DIR=./carbon/ docker-compose up -d
 
 StorPerf is now available at http://docker-host:5000/