diff options
| author |   Mark Beierl <mark.beierl@dell.com> | 2017-07-20 20:47:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-20 20:47:30 +0000 |
| commit | bc5aeb16806c5b38506a9d2054ec772ad96dc16e (patch) | |
| tree | 82365a19a052447991648697462be79d8e7339db | |
| parent | 75d55c811b035dd4752458ddbcb2ab3d8c055601 (diff) | |
| parent | b934a2867e39ab27878bc2bbf06bdcaa6b740b88 (diff) | |
Merge "Restore Proper Logging"
| -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/ |