aboutsummaryrefslogtreecommitdiffstats
path: root/docs/testing/user/userguide
diff options
context:
space:
mode:
authorMalanik Jan <janx.malanik@intel.com>2017-11-28 08:22:17 -0800
committerMalanik Jan <janx.malanik@intel.com>2017-12-14 07:54:31 -0800
commit057b1a79717c12eb283baeed94963cda2ff26df8 (patch)
tree353d21136ac59bd0c7fedba8488a5ccb76ef4f51 /docs/testing/user/userguide
parent93f53ca898891f5fd5fb5994c40932900aea1e73 (diff)
Bugfix:proxy env, ansible multinode support
JIRA: YARDSTICK-893 - hosts and plays in ansible/nsb_setup.yml refactored Fixed proxy configuration from env or /etc/environment in nsb_setup.sh Fixed ansible parameter 'environment: "{{ proxy_env }}"' in: - roles for components download. - roles for components dependencies install. Now, you can use ansible to modify all yardstick-standalone hosts at once. 1) Configure http[s]_proxy in - /etc/environment or - env variables 2) Modify 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 [all:vars] ansible_user=root ansible_pass=root 3) start: ./nsb_setup.sh # for baremetal/sriov ./nsb_setup.sh <path to admin-openrc.sh> #for openstack heat Change-Id: I167db8bae8303210f21e8ae6f3870ef054bbedce Signed-off-by: Malanik Jan <janx.malanik@intel.com>
Diffstat (limited to 'docs/testing/user/userguide')
-rw-r--r--docs/testing/user/userguide/12-nsb_installation.rst48
1 files changed, 44 insertions, 4 deletions
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