summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJing Lu <lvjing5@huawei.com>2017-06-24 03:09:21 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-06-24 03:09:21 +0000
commitcd5bb5f2dd2ec89e6c814c2771402aa8e39e10ef (patch)
tree49920ee49f53b97929fe6bccbb7b8457550e49b9 /docs
parent674a9902d40aef9a4c80669a0d00fc47447a806e (diff)
parent22512b3db867200ad2f53959138b7323d7efb3e0 (diff)
Merge "Improve Yardstick user-guide"
Diffstat (limited to 'docs')
-rw-r--r--docs/testing/user/userguide/04-installation.rst8
1 files changed, 7 insertions, 1 deletions
diff --git a/docs/testing/user/userguide/04-installation.rst b/docs/testing/user/userguide/04-installation.rst
index 0c2bb58cf..660f3b5a8 100644
--- a/docs/testing/user/userguide/04-installation.rst
+++ b/docs/testing/user/userguide/04-installation.rst
@@ -149,7 +149,12 @@ In the Yardstick container, the Yardstick repository is located in the ``/home/o
yardstick env prepare
-**NOTE**: The above command just works for four OPNFV installers -- **Apex**, **Compass**, **Fuel** and **Joid**.
+**NOTE**: The above command works for four OPNFV installers -- **Apex**, **Compass**, **Fuel** and **Joid**.
+For Non-OPNFV installer OpenStack environment, the above command can also be used to configure the environment.
+But before running the above command in a Non-OPNFV installer environment, it is necessary to create the /etc/yardstick/openstack.creds file and
+save OpenStack environment variables in it. For details of the required OpenStack environment variables please refer to
+section **Export OpenStack environment variables**
+
The env prepare command may take up to 6-8 minutes to finish building
yardstick-image and other environment preparation. Meanwhile if you wish to
monitor the env prepare process, you can enter the Yardstick container in a new
@@ -506,3 +511,4 @@ yaml file and add test cases, constraint or task arguments if necessary.
Proxy Support (**Todo**)
---------------------------
+