Browse Source

Update to Cirros 0.5.2 ahead of switching to the q35 machine type

Before switching the default machine type of instances to q35 in
tripleo-heat-templates via I9f60a73577ae7cd712e2a8285abc0c0788906112 we
first need to ensure that Cirros is updated to 0.5.2 that includes the
ahci module [1][2].

As set out in I12e0bdb3699e5343592ab834468ba6b2fcdcaaf4 for devstack and
Iad1adbc23b31dd54a96299e7a8a4b622c15eed8d for Nova this is required to
allow Cirros based instances to see the now SATA based config drive
cdroms attached to them during a Tempest run.

[1] https://github.com/cirros-dev/cirros/releases/tag/0.5.2
[2] https://github.com/cirros-dev/cirros/pull/65

Change-Id: Ia3f839a3c5e4e4b59898c11561fe7ef7126bba5f
changes/75/785575/1
Lee Yarwood 1 year ago
parent
commit
d9a1e8c3d6
  1. 2
      playbooks/tasks/tempest.yml
  2. 6
      roles/nodepool-setup/defaults/main.yml
  3. 10
      roles/validate-simple/defaults/main.yml
  4. 2
      roles/validate-tempest/defaults/main.yml

2
playbooks/tasks/tempest.yml

@ -209,7 +209,7 @@
- name: set cirros image facts for periodic
vars:
default_cirros_image: /opt/cache/files/cirros-0.4.0-x86_64-disk.img
default_cirros_image: /opt/cache/files/cirros-0.5.2-x86_64-disk.img
set_fact:
tempest_tempestconf_profile_extras:
image: "{{ featureset_override['cirros_image'] | default(default_cirros_image) }}"

6
roles/nodepool-setup/defaults/main.yml

@ -1,7 +1,7 @@
---
nodepool_cirros_url: http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img
nodepool_cirros_dest: /opt/cache/files/cirros-0.4.0-x86_64-disk.img
nodepool_cirros_checksum: md5:443b7623e27ecf03dc9e01ee93f67afe
nodepool_cirros_url: http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img
nodepool_cirros_dest: /opt/cache/files/cirros-0.5.2-x86_64-disk.img
nodepool_cirros_checksum: md5:b874c39491a2377b8490f5f1e89761a4
repos:
- https://opendev.org/openstack/tripleo-quickstart
- https://opendev.org/openstack/tripleo-quickstart-extras

10
roles/validate-simple/defaults/main.yml

@ -8,12 +8,12 @@ validate_log: "{{ working_dir }}/overcloud_validate.log"
validate_stack_name: pingtest_stack
validate_success_status: CREATE_COMPLETE
validate_failed_status: CREATE_FAILED
validate_image_file: cirros-0.4.0-x86_64-uec.tar.gz
validate_image_url: "http://download.cirros-cloud.net/0.4.0/"
validate_image_file: cirros-0.5.2-x86_64-uec.tar.gz
validate_image_url: "http://download.cirros-cloud.net/0.5.2/"
validate_image_path: "/opt/cache/files/{{ validate_image_file }}"
image_disk: cirros-0.4.0-x86_64-blank.img
image_initramfs: cirros-0.4.0-x86_64-initrd
image_kernel: cirros-0.4.0-x86_64-vmlinuz
image_disk: cirros-0.5.2-x86_64-blank.img
image_initramfs: cirros-0.5.2-x86_64-initrd
image_kernel: cirros-0.5.2-x86_64-vmlinuz
validate_image_name: pingtest_image
validate_image_dir: "{{ working_dir }}/cirros_images"
release: mitaka

2
roles/validate-tempest/defaults/main.yml

@ -87,7 +87,7 @@ tempest_conf_version: "{{ tempest_conf_version_dict[release] }}"
tempestmail_config: config.yaml
tempestmail_log_server: http://logs.openstack.org
tempest_track_resources: true
tempest_test_image_version: 0.4.0
tempest_test_image_version: 0.5.2
tempest_test_image_name: cirros-{{ tempest_test_image_version }}-x86_64-disk.img
tempest_test_image_path: http://download.cirros-cloud.net/{{ tempest_test_image_version }}/{{ tempest_test_image_name }}
# A dict containing values to be removed from tempest.conf

Loading…
Cancel
Save