X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=nsb_setup.sh;h=1f534498046fdb831612bf5cadb575e15b18fbee;hb=refs%2Fchanges%2F53%2F61753%2F3;hp=4a8e4db93b950d3f448fc239416b3622886c984d;hpb=92f982f27f64247a1ad5c74fcf7800db294f7dd5;p=yardstick.git

diff --git a/nsb_setup.sh b/nsb_setup.sh
index 4a8e4db93..1f5344980 100755
--- a/nsb_setup.sh
+++ b/nsb_setup.sh
@@ -63,12 +63,20 @@ for i in "${pkg[@]}"; do
     fi
 done
 
-pip install ansible==2.3.2 shade==1.17.0 docker-py==1.10.6
+pip install ansible==2.5.5 shade==1.22.2 docker-py==1.10.6
 
 ANSIBLE_SCRIPTS="ansible"
 
+if [[ -n ${1} ]]; then
+    yardstick_docker_image="-e yardstick_docker_image=${1}"
+else
+    yardstick_docker_image=""
+fi
+
+# no quotes for yardstick_docker_image so when empty it is removed as whitespace
 cd ${ANSIBLE_SCRIPTS} &&\
 ansible-playbook \
          -e img_property="nsb" \
+         ${yardstick_docker_image} \
          -e YARD_IMG_ARCH='amd64' ${extra_args}\
-         -i yardstick-install-inventory.ini nsb_setup.yml
+         -i install-inventory.ini nsb_setup.yml