From fcbe7f542356c89b894c49b62b0a4fdc181c3052 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Sat, 13 Jan 2018 08:26:03 +0000 Subject: Add "img_property" when building Yardstick image Since [1], when "build_yardstick_image.yml" is executed, a variable called "img_property" must be set. This variable could be "normal" or "nsb", depending on the type of image to generate. [1] I9fdf30084511ca9a008df3b53887b06273bbd549 JIRA: YARDSTICK-921 Change-Id: Ie3ca6fcf76b94eb9604847aefa77c6a644dddd14 Signed-off-by: Rodolfo Alonso Hernandez --- ansible/load_images.yml | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) (limited to 'ansible/load_images.yml') diff --git a/ansible/load_images.yml b/ansible/load_images.yml index a4c130d46..d4b24c864 100644 --- a/ansible/load_images.yml +++ b/ansible/load_images.yml @@ -29,41 +29,15 @@ IMAGE_COMMAND: yardstick-img-modify IMAGE_OUTPUT: "/tmp/workspace/yardstick/yardstick-image.tar.gz" -# QCOW_IMAGE: "/tmp/workspace/yardstick/yardstick-image.img" -# RAW_IMAGE: "/tmp/workspace/yardstick/yardstick-image.tar.gz" -# IMAGE_COMMANDS: -# 'lxd': yardstick-img-lxd-modify -# 'default': yardstick-img-modify - - roles: - role: add_fuel_jumphost when: "INSTALLER_TYPE == 'fuel'" - role: detect_fuel_arch when: "INSTALLER_TYPE == 'fuel'" -# post_tasks: -# -# - command: "{{ DEPLOY_VARS[DEPLOY_SCENARIO].IMAGE_COMMAND }}" "{{ IMAGE_MODIFY_SCRIPT }}" -# become: true -# register: image_modify_result -# retries: 2 -# untils: image_modify_result|succeeded -# -# - stat: path="{{ DEPLOY_VARS[DEPLOY_SCENARIO].IMAGE_OUTPUT }}"} -# register: output_stat -# -# - fail: msg="" -# when: not output_stat - - - include: build_yardstick_image.yml + vars: + img_property: normal - include: image_uploaders/upload_yardstick_image.yml -# upload cirros -# upload vanilla ubuntu cloud_image - -# - include: create_flavors.yml - - -- cgit 1.2.3-korg