diff options
| author |   Emma Foley <emma.l.foley@intel.com> | 2018-05-10 09:18:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-05-10 09:18:23 +0000 |
| commit | e838b31a6053085d8fa5641eeff0716e931de0a1 (patch) | |
| tree | a17bc134971e28b81ad5452cac85670005a3fd01 | |
| parent | d5f2224309dcefa2acd3bb3bb822ce9379c0ecbc (diff) | |
| parent | 9a060b441765f04ac086c07f157abf9d90d9e883 (diff) | |
Merge "nsb_setup: parametrize docker image"
| -rw-r--r-- | ansible/nsb_setup.yml | 2 | ||||
| -rwxr-xr-x | nsb_setup.sh | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ansible/nsb_setup.yml b/ansible/nsb_setup.yml index 0149054ae..fcde1d1b2 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 |