X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docs%2Fuserguide%2F07-installation.rst;h=9c2082a27d3221345e788782f6acaf7b6f4e82e7;hb=ed355ea25b8a32468db9006d9a8eee2363748515;hp=d3d7bc1ce8815cf50ba5a3793483c065780ae182;hpb=542caba88c24d7572f22922440ed711ad2a32640;p=yardstick.git

diff --git a/docs/userguide/07-installation.rst b/docs/userguide/07-installation.rst
index d3d7bc1ce..9c2082a27 100644
--- a/docs/userguide/07-installation.rst
+++ b/docs/userguide/07-installation.rst
@@ -75,47 +75,13 @@ If you choose to use the Ubuntu 14.04 Docker image, You can pull the Ubuntu
 
 Installing Yardstick framework
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Install dependencies:
-
-::
-
-  sudo apt-get update && sudo apt-get install -y \
-      wget \
-      git \
-      sshpass \
-      qemu-utils \
-      kpartx \
-      libffi-dev \
-      libssl-dev \
-      python \
-      python-dev \
-      python-virtualenv \
-      libxml2-dev \
-      libxslt1-dev \
-      python-setuptools
-
-Create a python virtual environment, source it and update setuptools:
-
-::
-
-  virtualenv ~/yardstick_venv
-  source ~/yardstick_venv/bin/activate
-  easy_install -U setuptools
-
 Download source code and install python dependencies:
 
 ::
 
   git clone https://gerrit.opnfv.org/gerrit/yardstick
   cd yardstick
-  python setup.py install
-
-A Youtube video tutorial on this installation mode is available
-at: http://www.youtube.com/watch?v=4S4izNolmR0
-
-.. image:: http://img.youtube.com/vi/4S4izNolmR0/0.jpg
-   :alt: http://www.youtube.com/watch?v=4S4izNolmR0
-   :target: http://www.youtube.com/watch?v=4S4izNolmR0
+  ./install.sh
 
 
 Installing Yardstick using Docker
@@ -148,7 +114,7 @@ Run the Docker image:
 
 ::
 
-  docker run --privileged=true -it opnfv/yardstick /bin/bash
+  docker run --privileged=true -it opnfv/yardstick:stable /bin/bash
 
 In the container the Yardstick repository is located in the /home/opnfv/repos
 directory.
@@ -245,9 +211,9 @@ Example command:
 ::
 
   glance --os-image-api-version 1 image-create \
-  --name yardstick-trusty-server --is-public true \
+  --name yardstick-image --is-public true \
   --disk-format qcow2 --container-format bare \
-  --file /tmp/workspace/yardstick/yardstick-trusty-server.img
+  --file /tmp/workspace/yardstick/yardstick-image.img
 
 Some Yardstick test cases use a Cirros image, you can find one at
 http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
@@ -399,7 +365,7 @@ here, you must specify the schema and the name, then you just need to list the
 test cases in the tag "test_cases" and also mark their relative directory in the
 tag "test_cases_dir".
 
-Yardstick test suite also support constraints and task args for each test suite.
+Yardstick test suite also support constraints and task args for each test case.
 Here is another sample to show this, which is digested from one big test suite.
 
 os-nosdn-nofeature-ha.yaml