summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>2018-01-23 17:35:05 +0000
committerMytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>2018-01-25 09:11:30 +0000
commite67082ecf9c89eeebbdf2c87b0a90e3edef2eabd (patch)
tree08a63023d07dbbc9516a6b5f153976c45d8903ac
parent810f91e242a5d1a562712df72a9ec95605ed1bab (diff)
Remove img_modify_playbook from nsb_setup.sh script
The `img_modify_playbook` variable is not used anymore by the build_yardstick_image.yml. The `img_property` variable is used instead. The `img_modify_playbook` usage has been removed and the `img_property` has been introduced in YARDSTICK-879 JIRA story. JIRA: YARDSTICK-964 Change-Id: I0239544c4f4078de7a4817292ab6bd789c21e944 Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com> Signed-off-by: Alonso Hernandez, Rodolfo <rodolfo.alonso.hernandez@intel.com>
-rwxr-xr-xnsb_setup.sh2
-rwxr-xr-xtests/ci/ansible_load_images.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/nsb_setup.sh b/nsb_setup.sh
index a983f4de7..cb44839af 100755
--- a/nsb_setup.sh
+++ b/nsb_setup.sh
@@ -59,6 +59,6 @@ ANSIBLE_SCRIPTS="ansible"
cd ${ANSIBLE_SCRIPTS} &&\
ansible-playbook \
- -e img_modify_playbook='ubuntu_server_cloudimg_modify_samplevnfs.yml' \
+ -e img_property="nsb" \
-e YARD_IMG_ARCH='amd64' ${extra_args}\
-i yardstick-install-inventory.ini nsb_setup.yml
diff --git a/tests/ci/ansible_load_images.sh b/tests/ci/ansible_load_images.sh
index 9a2d8ef18..6e08e1a78 100755
--- a/tests/ci/ansible_load_images.sh
+++ b/tests/ci/ansible_load_images.sh
@@ -21,7 +21,7 @@ ANSIBLE_SCRIPTS="${0%/*}/../../ansible"
cd ${ANSIBLE_SCRIPTS} &&\
ansible-playbook \
- -e img_modify_playbook='ubuntu_server_cloudimg_modify.yml' \
+ -e img_property="normal" \
-e target_os='Ubuntu' \
-e YARD_IMG_ARCH='amd64' \
-vvv -i inventory.ini load_images.yml