Merge branch 'stackhpc/2024.1' into cross-arch-builds-2024.1

bbezak · bbezak · commit 62a98798aee1 · 2025-03-26T17:33:29.000+01:00
diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
@@ -6,3 +6,6 @@ kolla_image_tags:
   openstack:
     rocky-9: 2024.1-rocky-9-20250326T134749
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250326T134749
+  bifrost:
+    rocky-9: 2024.1-rocky-9-20250325T141125
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250325T141125
diff --git a/etc/kayobe/kolla/config/bifrost/bifrost.yml b/etc/kayobe/kolla/config/bifrost/bifrost.yml
@@ -8,3 +8,12 @@ cirros_deploy_image_upstream_url: "{{ stackhpc_overcloud_host_image_url }}"
 
 # Disable debug logging to avoid generating large log files
 ironic_debug: false
+
+# Use prebuilt release train IPA images from Ark.
+{% if stackhpc_ipa_image_bifrost_enabled | bool %}
+ipa_download_url_username: "{{ stackhpc_release_pulp_username }}"
+ipa_download_url_password: "{{ stackhpc_release_pulp_password }}"
+ipa_download_force_basic_auth: true
+ipa_download_unredirected_headers:
+  - Authorization
+{% endif %}
diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml
@@ -157,7 +157,7 @@ stackhpc_kolla_source_version: stackhpc/18.6.0.2
 
 # Kolla Ansible source repository.
 stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
-stackhpc_kolla_ansible_source_version: stackhpc/18.5.0.2
+stackhpc_kolla_ansible_source_version: stackhpc/18.6.0.1
 
 ###############################################################################
 # Container image registry
diff --git a/releasenotes/notes/bifrost-fix-ipa-auth-9d0e0c3b948b5850.yaml b/releasenotes/notes/bifrost-fix-ipa-auth-9d0e0c3b948b5850.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes an issue where the IPA images in Ark could not be downloaded by
+    Bifrost, due to missing authentication parameters.
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-kayobe@git+https://github.com/stackhpc/kayobe@stackhpc/16.5.0.2
+kayobe@git+https://github.com/stackhpc/kayobe@stackhpc/16.5.0.5
 ansible-modules-hashivault>=5.2.1
 jmespath

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +fixes:
 +  - |
 +    Fixes an issue where the IPA images in Ark could not be downloaded by
 +    Bifrost, due to missing authentication parameters.