From: mbeierl Date: Thu, 20 Jul 2017 19:54:40 +0000 (-0400) Subject: Restore Proper Logging X-Git-Tag: opnfv-5.0.RC1~64^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F37879%2F2;p=storperf.git 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 --- 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 --- 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/