From 717f4d9fe1bb5798e9e4b0fce24e0131d59120e6 Mon Sep 17 00:00:00 2001
From: Bartosz Bezak <bartosz@stackhpc.com>
Date: Tue, 10 Jan 2023 11:39:05 +0100
Subject: [PATCH] set previous_release to zed
Upgrade CI job needs clouds.yaml to be used from Zed
Newer version of ansible-collections-openstack uses different return
value. [1]
[1] https://review.opendev.org/c/openstack/ansible-collections-openstack/+/841224
Change-Id: Ic0608bc6033025cb47655d601ffaf3744637832f
---
ansible/roles/ipa-images/tasks/main.yml | 8 ++++----
ansible/roles/ipa-images/tasks/set-driver-info.yml | 4 ++--
playbooks/kayobe-overcloud-upgrade-base/run.yml | 1 +
zuul.d/jobs.yaml | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ansible/roles/ipa-images/tasks/main.yml b/ansible/roles/ipa-images/tasks/main.yml
index a5bdb72d..d47ac715 100644
--- a/ansible/roles/ipa-images/tasks/main.yml
+++ b/ansible/roles/ipa-images/tasks/main.yml
@@ -88,13 +88,13 @@
extension: "{{ item.created_at | replace(':', '-') }}~"
with_items:
- name: "{{ ipa_images_kernel_name }}"
- created_at: "{{ ipa_images_kernel.openstack_image.created_at | default }}"
+ created_at: "{{ ipa_images_kernel.openstack_images[0].created_at | default }}"
checksum: "{{ ipa_images_checksum.results[0].stat.checksum }}"
- glance_checksum: "{{ ipa_images_kernel.openstack_image.checksum | default }}"
+ glance_checksum: "{{ ipa_images_kernel.openstack_images[0].checksum | default }}"
- name: "{{ ipa_images_ramdisk_name }}"
- created_at: "{{ ipa_images_ramdisk.openstack_image.created_at | default }}"
+ created_at: "{{ ipa_images_ramdisk.openstack_images[0].created_at | default }}"
checksum: "{{ ipa_images_checksum.results[1].stat.checksum }}"
- glance_checksum: "{{ ipa_images_ramdisk.openstack_image.checksum | default }}"
+ glance_checksum: "{{ ipa_images_ramdisk.openstack_images[0].checksum | default }}"
when:
- item.glance_checksum
- item.checksum != item.glance_checksum
diff --git a/ansible/roles/ipa-images/tasks/set-driver-info.yml b/ansible/roles/ipa-images/tasks/set-driver-info.yml
index 5e70eef5..c35fd4ff 100644
--- a/ansible/roles/ipa-images/tasks/set-driver-info.yml
+++ b/ansible/roles/ipa-images/tasks/set-driver-info.yml
@@ -14,11 +14,11 @@
- name: Set fact containing kernel uuid
set_fact:
- ipa_images_kernel_uuid: "{{ ipa_images_glance.results[0].openstack_image.id }}"
+ ipa_images_kernel_uuid: "{{ ipa_images_glance.results[0].openstack_images[0].id }}"
- name: Set fact containing ramdisk uuid
set_fact:
- ipa_images_ramdisk_uuid: "{{ ipa_images_glance.results[1].openstack_image.id }}"
+ ipa_images_ramdisk_uuid: "{{ ipa_images_glance.results[1].openstack_images[0].id }}"
- name: Get a list of ironic nodes
command: |
diff --git a/playbooks/kayobe-overcloud-upgrade-base/run.yml b/playbooks/kayobe-overcloud-upgrade-base/run.yml
index 677b7c29..04257e4e 100644
--- a/playbooks/kayobe-overcloud-upgrade-base/run.yml
+++ b/playbooks/kayobe-overcloud-upgrade-base/run.yml
@@ -45,6 +45,7 @@
- etc/kayobe/kolla/passwords.yml
- etc/kolla/admin-openrc.sh
- etc/kolla/public-openrc.sh
+ - etc/kolla/clouds.yaml
# NOTE(mgoddard): Use the name zz-overrides.yml to ensure this takes
# precedence over the standard config files.
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 366aa3f8..9963249e 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -87,7 +87,7 @@
- ^zuul.d/.*
vars:
# Name of the release to upgrade from for upgrade jobs.
- previous_release: yoga
+ previous_release: zed
logs_dir: "/tmp/logs"
ansible_collection_kolla_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/ansible-collection-kolla'].src_dir }}"
kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kayobe'].src_dir }}"
--
GitLab