X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=nsb_setup.sh;h=86796c4d4f00831d062681d018f0b4452e680160;hb=8068adbf0aa5275f9c4cd4e298f1868834242e9a;hp=4a8e4db93b950d3f448fc239416b3622886c984d;hpb=31537ccdae3e876ffeb43a7a49e55127079e62a3;p=yardstick.git diff --git a/nsb_setup.sh b/nsb_setup.sh index 4a8e4db93..86796c4d4 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.4.2 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