From e67082ecf9c89eeebbdf2c87b0a90e3edef2eabd Mon Sep 17 00:00:00 2001 From: "Mytnyk, Volodymyr" Date: Tue, 23 Jan 2018 17:35:05 +0000 Subject: 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 Signed-off-by: Alonso Hernandez, Rodolfo --- nsb_setup.sh | 2 +- tests/ci/ansible_load_images.sh | 2 +- 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 -- cgit 1.2.3-korg