Skip to content

Commit 712dfb3

Browse files
rabicursoragent
authored andcommitted
[edpm_prepare] Fall back to quay.io bootc OS image
Default bootc OS images to quay.io/openstack-k8s-operators/edpm-bootc:latest-qcow2 when content-provider does not build them. CP output overrides that default. Signed-off-by: rabi <ramishra@redhat.com> Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent e986def commit 712dfb3

3 files changed

Lines changed: 12 additions & 1 deletion

File tree

roles/edpm_prepare/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ This role doesn't need privilege escalation.
2020
* `cifmw_edpm_prepare_wait_controplane_status_change_sec`: (Integer) Time, in seconds, to wait before checking
2121
openstack control plane deployment status. Useful when using the role to only update the control plane resource, scenario where it may be in a `ready` status. Defaults to `30`.
2222
* `cifmw_edpm_prepare_extra_kustomizations`: (List) Extra Kustomizations to apply on top of the controlplane CRs. Defaults to `[]`.
23+
* `cifmw_edpm_prepare_bootc_os_image_url`: (String) Default bootc OS container image used when content-provider did not build one. Defaults to `quay.io/openstack-k8s-operators/edpm-bootc:latest-qcow2`.

roles/edpm_prepare/defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,6 @@ cifmw_edpm_prepare_kustomizations: []
3434
cifmw_edpm_prepare_wait_controplane_status_change_sec: 30
3535
cifmw_edpm_prepare_extra_kustomizations: []
3636
cifmw_prepare_openstackversion: true
37+
# Default bootc OS image when content-provider did not build one.
38+
cifmw_edpm_prepare_bootc_os_image_url: >-
39+
quay.io/openstack-k8s-operators/edpm-bootc:latest-qcow2

roles/edpm_prepare/tasks/main.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@
170170
}}
171171
cacheable: true
172172
when:
173-
- cifmw_update_containers_edpm_image_url is not defined
174173
- cifmw_build_images_output is defined
175174
- "'images' in cifmw_build_images_output"
176175
- >-
@@ -182,6 +181,14 @@
182181
'edpm-hardened-uefi' in cifmw_build_images_output['images']
183182
)
184183
184+
- name: Set default bootc OS image url when not built by content provider
185+
ansible.builtin.set_fact:
186+
cifmw_update_containers_edpm_image_url: "{{ cifmw_edpm_prepare_bootc_os_image_url }}"
187+
cacheable: true
188+
when:
189+
- cifmw_edpm_deploy_baremetal_bootc | default(false) | bool
190+
- cifmw_update_containers_edpm_image_url is not defined
191+
185192
# Prepare and kustomize the OpenStackControlPlane CR
186193
- name: Prepare OpenStack control plane CR
187194
vars:

0 commit comments

Comments
 (0)