summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2018-04-25 07:47:35 -0700
committerRoss Brattain <ross.b.brattain@intel.com>2018-04-26 04:58:18 +0000
commit9a060b441765f04ac086c07f157abf9d90d9e883 (patch)
tree43bce6013d26d7d781b4938624dd8a0221f9ce94
parent14094f7bf478224d5631494d1fa41bf9e8ba2cde (diff)
nsb_setup: parametrize docker image
The user may need to pull a different image stable or a tagged release version. Since we can't pull a tagged image before it is tagged just give up and make it an argument JIRA: YARDSTICK-1137 Change-Id: I0caf0f8915c191786c7db6d929be2fa350a545af Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
-rw-r--r--ansible/nsb_setup.yml2
-rwxr-xr-xnsb_setup.sh8
2 files changed, 9 insertions, 1 deletions
diff --git a/ansible/nsb_setup.yml b/ansible/nsb_setup.yml
index 98a59f984..92f5d8390 100644
--- a/ansible/nsb_setup.yml
+++ b/ansible/nsb_setup.yml
@@ -37,7 +37,7 @@
name: yardstick
pull: yes
recreate: yes
- image: opnfv/yardstick:latest
+ image: "{{ yardstick_docker_image|default('opnfv/yardstick:latest') }}"
state: started
restart_policy: always
privileged: yes
diff --git a/nsb_setup.sh b/nsb_setup.sh
index 50fc017d1..86796c4d4 100755
--- a/nsb_setup.sh
+++ b/nsb_setup.sh
@@ -67,8 +67,16 @@ 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