diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2018-02-01 19:24:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-01 19:24:34 +0000 |
| commit | 59899b4d559cf823cc25cb470887223bb0724e17 (patch) | |
| tree | 8a92b80e0ea56f85b394148f51433bb6eb85dd82 /ansible/load_images.yml | |
| parent | 0eaab35c0129de150d8c726cb0f205aa76f2b464 (diff) | |
| parent | fcbe7f542356c89b894c49b62b0a4fdc181c3052 (diff) | |
Merge "Add "img_property" when building Yardstick image"
Diffstat (limited to 'ansible/load_images.yml')
| -rw-r--r-- | ansible/load_images.yml | 30 |
1 files changed, 2 insertions, 28 deletions
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 - - |