diff options
| author |   Volodymyr Mytnyk <volodymyrx.mytnyk@intel.com> | 2018-12-12 14:34:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-12-12 14:34:59 +0000 |
| commit | 2809cb6adfbfe5e87cf78eb562149f37498477e0 (patch) | |
| tree | e20dcafe8e90ba646b8cd25b9d7a0088e4af9825 /ansible/roles/build_yardstick_image | |
| parent | edb66ef37f9d89a783f3eda15d82d6fcebd7598e (diff) | |
| parent | 85644d1a6d5e6af361367321b7805d69c7e7f26e (diff) | |
Merge "Modify install.yaml to support Ubuntu 18"
Diffstat (limited to 'ansible/roles/build_yardstick_image')
| -rw-r--r-- | ansible/roles/build_yardstick_image/vars/main.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ansible/roles/build_yardstick_image/vars/main.yml b/ansible/roles/build_yardstick_image/vars/main.yml index 6728e5afb..3d4054408 100644 --- a/ansible/roles/build_yardstick_image/vars/main.yml +++ b/ansible/roles/build_yardstick_image/vars/main.yml @@ -16,11 +16,13 @@ boot_modes: 'amd64': disk1
'arm64': uefi1
boot_mode: "{{ boot_modes[YARD_IMG_ARCH] }}"
-image_filename: "{{ release }}-server-cloudimg-{{ YARD_IMG_ARCH }}-{{ boot_mode }}.img"
-image_path: "{{ release }}/current/{{ image_filename }}"
+image_filename:
+ 'xenial': "{{ release }}-server-cloudimg-{{ YARD_IMG_ARCH }}-{{ boot_mode }}.img"
+ 'bionic': "{{ release }}-server-cloudimg-{{ YARD_IMG_ARCH }}.img"
+image_path: "{{ release }}/current/{{ image_filename[release] }}"
host: "{{ lookup('env', 'HOST')|default('cloud-images.ubuntu.com', true)}}"
image_url: "{{ lookup('env', 'IMAGE_URL')|default('https://' ~ host ~ '/' ~ image_path, true) }}"
-image_dest: "{{ workspace }}/{{ image_filename }}"
+image_dest: "{{ workspace }}/{{ image_filename[release] }}"
sha256sums_path: "{{ release }}/current/SHA256SUMS"
sha256sums_filename: "{{ sha256sums_path|basename }}"
sha256sums_url: "{{ lookup('env', 'SHA256SUMS_URL')|default('https://' ~ host ~ '/' ~ sha256sums_path, true) }}"
|