From b934a2867e39ab27878bc2bbf06bdcaa6b740b88 Mon Sep 17 00:00:00 2001
From: mbeierl <mark.beierl@dell.com>
Date: Thu, 20 Jul 2017 15:54:40 -0400
Subject: 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>
---
 docker/storperf-master/logging.json          | 51 ++++++++++++++++++++++++++++
 docker/storperf-master/storperf/logging.json | 51 ----------------------------
 docs/testing/user/installation.rst           |  7 ++--
 3 files changed, 55 insertions(+), 54 deletions(-)
 create mode 100644 docker/storperf-master/logging.json
 delete mode 100644 docker/storperf-master/storperf/logging.json

diff --git a/docker/storperf-master/logging.json b/docker/storperf-master/logging.json
new file mode 100644
index 0000000..2a0bbce
--- /dev/null
+++ b/docker/storperf-master/logging.json
@@ -0,0 +1,51 @@
+{
+    "version": 1,
+    "disable_existing_loggers": false,
+    "formatters": {
+        "simple": {
+            "format": "%(asctime)s - %(threadName)s - %(name)s - %(levelname)s - %(message)s"
+        }
+    },
+
+    "handlers": {
+        "console": {
+            "class": "logging.StreamHandler",
+            "level": "DEBUG",
+            "formatter": "simple",
+            "stream": "ext://sys.stdout"
+        },
+
+        "file_handler": {
+            "class": "logging.handlers.RotatingFileHandler",
+            "level": "DEBUG",
+            "formatter": "simple",
+            "filename": "storperf.log",
+            "maxBytes": 10485760,
+            "backupCount": 20,
+            "encoding": "utf8"
+        },
+
+        "error_file_handler": {
+            "class": "logging.handlers.RotatingFileHandler",
+            "level": "ERROR",
+            "formatter": "simple",
+            "filename": "errors.log",
+            "maxBytes": 10485760,
+            "backupCount": 20,
+            "encoding": "utf8"
+        }
+    },
+
+    "loggers": {
+        "": {
+            "level": "INFO",
+            "handlers": ["console", "file_handler", "error_file_handler"]
+        },
+        "storperf": {
+            "level": "DEBUG"
+        },
+        "storperf.carbon.emitter": {
+            "level": "INFO"
+        }
+    }
+}
diff --git a/docker/storperf-master/storperf/logging.json b/docker/storperf-master/storperf/logging.json
deleted file mode 100644
index 2a0bbce..0000000
--- a/docker/storperf-master/storperf/logging.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "version": 1,
-    "disable_existing_loggers": false,
-    "formatters": {
-        "simple": {
-            "format": "%(asctime)s - %(threadName)s - %(name)s - %(levelname)s - %(message)s"
-        }
-    },
-
-    "handlers": {
-        "console": {
-            "class": "logging.StreamHandler",
-            "level": "DEBUG",
-            "formatter": "simple",
-            "stream": "ext://sys.stdout"
-        },
-
-        "file_handler": {
-            "class": "logging.handlers.RotatingFileHandler",
-            "level": "DEBUG",
-            "formatter": "simple",
-            "filename": "storperf.log",
-            "maxBytes": 10485760,
-            "backupCount": 20,
-            "encoding": "utf8"
-        },
-
-        "error_file_handler": {
-            "class": "logging.handlers.RotatingFileHandler",
-            "level": "ERROR",
-            "formatter": "simple",
-            "filename": "errors.log",
-            "maxBytes": 10485760,
-            "backupCount": 20,
-            "encoding": "utf8"
-        }
-    },
-
-    "loggers": {
-        "": {
-            "level": "INFO",
-            "handlers": ["console", "file_handler", "error_file_handler"]
-        },
-        "storperf": {
-            "level": "DEBUG"
-        },
-        "storperf.carbon.emitter": {
-            "level": "INFO"
-        }
-    }
-}
diff --git a/docs/testing/user/installation.rst b/docs/testing/user/installation.rst
index de7eeb7..8952f48 100755
--- 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/
 
-- 
cgit 1.2.3-korg