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>

diff --git a/nsb_setup.sh b/nsb_setup.sh
index a983f4d..cb44839 100755 (executable)
--- 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 9a2d8ef..6e08e1a 100755 (executable)
--- 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