From 85644d1a6d5e6af361367321b7805d69c7e7f26e Mon Sep 17 00:00:00 2001 From: Stepan Andrushko Date: Fri, 7 Sep 2018 15:15:08 +0300 Subject: Modify install.yaml to support Ubuntu 18 Modify install.yaml to be able to install Yardstick on the newest Ubuntu 18.04 LTS. Yardstick installation on Ubuntu 16 is still supported. Default version is Ubuntu 16.04 (xenial). JIRA: YARDSTICK-1413 Change-Id: Ic8aca0699645c68831ee739deeaeceef418075f5 Signed-off-by: Stepan Andrushko --- ansible/roles/build_yardstick_image/vars/main.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ansible/roles/build_yardstick_image/vars') 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) }}" -- cgit 1.2.3-korg