2 files changed, 129 insertions, 4 deletions

diff --git a/docs/testing/user/userguide/04-installation.rst b/docs/testing/user/userguide/04-installation.rst
index dc528db6c..828c49581 100644
--- a/docs/testing/user/userguide/04-installation.rst
+++ b/docs/testing/user/userguide/04-installation.rst
@@ -331,6 +331,91 @@ For uninstalling Yardstick, just delete the virtual environment::
    rm -rf ~/yardstick_venv
 
 
+Install Yardstick directly in OpenSUSE
+--------------------------------------
+
+.. _install-framework:
+
+You can install Yardstick framework directly in OpenSUSE.
+
+
+Install Yardstick
+^^^^^^^^^^^^^^^^^
+
+Prerequisite preparation::
+
+   sudo -EH zypper -n install -y gcc \
+      wget \
+      git \
+      sshpass \
+      qemu-tools \
+      kpartx \
+      libffi-devel \
+      libopenssl-devel \
+      python \
+      python-devel \
+      python-virtualenv \
+      libxml2-devel \
+      libxslt-devel \
+      python-setuptools-git
+
+Create a virtual environment::
+
+   virtualenv ~/yardstick_venv
+   export YARDSTICK_VENV=~/yardstick_venv
+   source ~/yardstick_venv/bin/activate
+   sudo -EH easy_install -U setuptools
+
+Download the source code and install Yardstick from it::
+
+   git clone https://gerrit.opnfv.org/gerrit/yardstick
+   export YARDSTICK_REPO_DIR=~/yardstick
+   cd yardstick
+   sudo -EH python setup.py install
+   sudo -EH pip install -r requirements.txt
+
+Install missing python modules::
+
+   sudo -EH pip install pyyaml \
+      oslo_utils \
+      oslo_serialization \
+      oslo_config \
+      paramiko \
+      python.heatclient \
+      python.novaclient \
+      python.glanceclient \
+      python.neutronclient \
+      scp \
+      jinja2
+
+
+Configure the Yardstick environment
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Source the OpenStack environment variables::
+
+   source DEVSTACK_DIRECTORY/openrc
+
+Export the Openstack external network. The default installation of Devstack
+names the external network public::
+
+   export EXTERNAL_NETWORK=public
+   export OS_USERNAME=demo
+
+Change the API version used by Yardstick to v2.0 (the devstack openrc sets it
+to v3)::
+
+   export OS_AUTH_URL=http://PUBLIC_IP_ADDRESS:5000/v2.0
+
+
+Uninstall Yardstick
+^^^^^^^^^^^^^^^^^^^
+
+For unistalling Yardstick, just delete the virtual environment::
+
+   rm -rf ~/yardstick_venv
+
+
 Verify the installation
 -----------------------
 
diff --git a/docs/testing/user/userguide/12-nsb_installation.rst b/docs/testing/user/userguide/12-nsb_installation.rst
index 8cc26acd5..a584ca231 100644
--- a/docs/testing/user/userguide/12-nsb_installation.rst
+++ b/docs/testing/user/userguide/12-nsb_installation.rst
@@ -112,12 +112,52 @@ Download the source code and install Yardstick from it
   # git checkout <tag or stable branch>
   git checkout stable/euphrates
 
-  # For Bare-Metal or Standalone Virtualization
-  ./nsb_setup.sh
+Configure the network proxy, either using the environment variables or setting
+the global environment file:
 
-  # For OpenStack
-  ./nsb_setup.sh <path to admin-openrc.sh>
+.. code-block:: ini
+    cat /etc/environment
+    http_proxy='http://proxy.company.com:port'
+    https_proxy='http://proxy.company.com:port'
 
+.. code-block:: console
+    export http_proxy='http://proxy.company.com:port'
+    export https_proxy='http://proxy.company.com:port'
+
+The last step is to modify the Yardstick installation inventory, used by
+Ansible:
+
+.. code-block:: ini
+  cat ./ansible/yardstick-install-inventory.ini
+  [jumphost]
+  localhost  ansible_connection=local
+
+  [yardstick-standalone]
+  yardstick-standalone-node ansible_host=192.168.1.2
+  yardstick-standalone-node-2 ansible_host=192.168.1.3
+
+  # section below is only due backward compatibility.
+  # it will be removed later
+  [yardstick:children]
+  jumphost
+
+  [all:vars]
+  ansible_user=root
+  ansible_pass=root
+
+
+To execute an installation for a Bare-Metal or a Standalone context:
+
+.. code-block:: console
+
+    ./nsb_setup.sh
+
+
+To execute an installation for an OpenStack context:
+
+.. code-block:: console
+
+    ./nsb_setup.sh <path to admin-openrc.sh>
 
 Above command setup docker with latest yardstick code. To execute