diff options
| author |   Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com> | 2018-01-13 08:26:03 +0000 |
|---|---|---|
| committer | Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com> | 2018-01-13 08:27:22 +0000 |
| commit | fcbe7f542356c89b894c49b62b0a4fdc181c3052 (patch) | |
| tree | 5393f90ea1946bca083cfafb71882c9b59fb4072 | |
| parent | d579e62b431a31856a03098dc5323948ccfa4fdb (diff) | |
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 <rodolfo.alonso.hernandez@intel.com>
| -rw-r--r-- | ansible/load_images.yml | 30 | ||||
| -rw-r--r-- | ansible/prepare_openstack.yml | 16 |
2 files changed, 7 insertions, 39 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 - - diff --git a/ansible/prepare_openstack.yml b/ansible/prepare_openstack.yml index 8456c9e59..6f54ef522 100644 --- a/ansible/prepare_openstack.yml +++ b/ansible/prepare_openstack.yml @@ -12,27 +12,21 @@ # See the License for the specific language governing permissions and # limitations under the License. --- -- name: convert openrc_file to openrc env dict +- name: Convert openrc_file to openrc env dict hosts: jumphost vars_files: - yardstick_config.yml roles: - convert_openrc -### -# Build yardstick image for openstack quest -# check included file for other vars/env -### -- include: build_yardstick_image.yml +- name: Build Yardstick image for OpenStack + include: build_yardstick_image.yml vars: YARD_IMG_ARCH: amd64 release: xenial + img_property: nsb -### -# Delete old yardstick image and flavors -# Upload new image -### -- name: cleanup old openstack images, upload new +- name: Cleanup old OpenStack images and upload the new one hosts: jumphost vars_files: - yardstick_config.yml |