diff options
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/load_images.yml | 30 | ||||
| -rw-r--r-- | ansible/prepare_openstack.yml | 16 | ||||
| -rw-r--r-- | ansible/roles/download_drivers/defaults/main.yml | 2 |
3 files changed, 8 insertions, 40 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 diff --git a/ansible/roles/download_drivers/defaults/main.yml b/ansible/roles/download_drivers/defaults/main.yml index ff4c30785..ab68a3c6d 100644 --- a/ansible/roles/download_drivers/defaults/main.yml +++ b/ansible/roles/download_drivers/defaults/main.yml @@ -14,7 +14,7 @@ --- i40evf_version: "3.4.2" i40evf_gzfile: "i40evf-{{ i40evf_version }}.tar.gz" -i40evf_url: "https://sourceforge.net/projects/e1000/files/i40evf%20stable/{{ i40evf_version }}/{{ i40evf_gzfile }}/download" +i40evf_url: "https://netix.dl.sourceforge.net/project/e1000/i40evf%20stable/{{ i40evf_version }}/{{ i40evf_gzfile }}" i40evf_dest: "{{ clone_dest }}/" i40evf_path: "{{ i40evf_dest }}/{{ i40evf_gzfile|regex_replace('[.]tar[.]gz$', '') }}" i40evf_checksum: |