diff options
author | mbeierl <mark.beierl@dell.com> | 2017-07-20 15:54:40 -0400 |
---|---|---|
committer | mbeierl <mark.beierl@dell.com> | 2017-07-20 16:28:22 -0400 |
commit | b934a2867e39ab27878bc2bbf06bdcaa6b740b88 (patch) | |
tree | 7790c5895169fc598fe9143ef1bcd4e9d7aae20c | |
parent | d38c48bfcf75b8011057bbda19d5ee6652a0351b (diff) |
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>
-rw-r--r-- | docker/storperf-master/logging.json (renamed from docker/storperf-master/storperf/logging.json) | 0 | ||||
-rwxr-xr-x | docs/testing/user/installation.rst | 7 |
2 files changed, 4 insertions, 3 deletions
diff --git a/docker/storperf-master/storperf/logging.json b/docker/storperf-master/logging.json index 2a0bbce..2a0bbce 100644 --- a/docker/storperf-master/storperf/logging.json +++ b/docker/storperf-master/logging.json 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/ |