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

Author: bbezak

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

etc/kayobe/kolla.yml

@@ -266,18 +266,13 @@ kolla_build_blocks:
         mkdir -p /etc/yum.repos.d.backup && \
         tar -czf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d . && \
     {% endif %}
-        echo "===== Before sed modifications I =====" && \
-        cat /etc/yum.repos.d/*.repo && \
     {% for repo in stackhpc_yum_repos %}
         sed -i -e '/\[{{ repo.tag }}\]/,/^\[/ s/^\(mirrorlist *=.*\)/#\1/g' \
                -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(baseurl *=.*\)/#\1/g' \
                -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(metalink *=.*\)/#\1/g' \
                -e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} && \
     {% endif %}
     {% endfor %}
-        && \
-        echo "===== After sed modifications I =====" && \
-        cat /etc/yum.repos.d/*.repo
     {% else %}
     RUN \
         rm /etc/apt/sources.list && \
@@ -294,8 +289,6 @@ kolla_build_blocks:
     {# fixme #}
     {% if kolla_base_distro == 'rocky' %}
         && \
-        echo "===== Before sed modifications II =====" && \
-        cat /etc/yum.repos.d/*.repo && \
     {% if stackhpc_kolla_clean_up_repo_mirrors | bool %}
         tar -xzf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d && \
         tar -czf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d . && \
@@ -307,9 +300,6 @@ kolla_build_blocks:
                -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(metalink *=.*\)/#\1/g' \
                -e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \
     {% endfor %}
-        && \
-        echo "===== After sed modifications II =====" && \
-        cat /etc/yum.repos.d/*.repo \
     {% endif %}
   # With the UCA keyring installed we can now add all repos.
   base_ubuntu_package_sources_list: |

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 %}

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

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.

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