Update virtualenv installation step in userguide

Change-Id: I0b3e8f22b6878c3b2cf1a54f3c39f2888406c508
Signed-off-by: JingLu5 <lvjing5@huawei.com>
(cherry picked from commit f6e13de54c5b71f9112c38b12f6c327af743d68a)

diff --git a/docs/testing/user/userguide/04-installation.rst b/docs/testing/user/userguide/04-installation.rst
index c1325ca..0c2bb58 100644 (file)
--- a/docs/testing/user/userguide/04-installation.rst
+++ b/docs/testing/user/userguide/04-installation.rst
@@ -63,6 +63,10 @@ Prepare the Yardstick container
 
 .. _dockerhub: https://hub.docker.com/r/opnfv/yardstick/
 
+Install docker on your guest system with the following command, if not done yet::
+
+  wget -qO- https://get.docker.com/ | sh
+
 Pull the Yardstick Docker image (``opnfv/yardstick``) from the public dockerhub
 registry under the OPNFV account: dockerhub_, with the following docker
 command::
@@ -146,6 +150,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**.
+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
+terminal window and execute the following command::
+
+  tail -f /var/log/yardstick/uwsgi.log
 
 
 The second way
@@ -267,14 +277,23 @@ Docker image from Docker hub::
 Install Yardstick
 ^^^^^^^^^^^^^^^^^^^^^
 
+Prerequisite preparation::
+
+  apt-get update && apt-get install -y git python-setuptools python-pip
+  easy_install -U setuptools==30.0.0
+  pip install appdirs==1.4.0
+  pip install virtualenv
+
 Create a virtual environment::
 
   virtualenv ~/yardstick_venv
+  export YARDSTICK_VENV=~/yardstick_venv
   source ~/yardstick_venv/bin/activate
 
 Download the source code and install Yardstick from it::
 
   git clone https://gerrit.opnfv.org/gerrit/yardstick
+  export YARDSTICK_REPO_DIR=~/yardstick
   cd yardstick
   ./install.sh
 
@@ -487,4 +506,3 @@ yaml file and add test cases, constraint or task arguments if necessary.
 
 Proxy Support (**Todo**)
 ---------------------------
-