Merge pull request #507 from stackhpc/upstream/2025.1-2025-12-08

Synchronise 2025.1 with upstream

Author: Alex-Welsh

playbooks/kayobe-base/pre.yml

@@ -134,7 +134,9 @@
         src: overrides.yml.j2
         dest: "{{ kayobe_config_src_dir }}/etc/kayobe/zz-10-overrides.yml"
 
-    - block:
+    - vars:
+        branch_prefix: "{{ 'unmaintained' if previous_release | lower == '2024.1' else 'stable' }}"
+      block:
         - name: Ensure previous kayobe directory exists
           file:
             path: "{{ previous_kayobe_src_dir }}"

playbooks/kayobe-overcloud-base/overrides.yml.j2

@@ -4,9 +4,6 @@ docker_daemon_debug: true
 docker_registry_mirrors:
   - "http://{{ zuul_site_mirror_fqdn }}:8082/"
 
-kolla_docker_namespace: "openstack.kolla"
-# use the published images from a site mirror of quay.io
-kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447"
 kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
 kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"
 kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla-ansible'].src_dir }}"

playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2

@@ -4,9 +4,6 @@ docker_daemon_debug: true
 docker_registry_mirrors:
   - "http://{{ zuul_site_mirror_fqdn }}:8082/"
 
-kolla_docker_namespace: "openstack.kolla"
-# use the published images from a site mirror of quay.io
-kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447"
 {% if not is_previous_release | default(false) %}
 kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
 kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"

playbooks/kayobe-seed-base/overrides.yml.j2

@@ -6,9 +6,6 @@ docker_registry_image_full: "quay.io/libpod/registry:2.8.2"
 docker_registry_mirrors:
   - "http://{{ zuul_site_mirror_fqdn }}:8082/"
 
-kolla_docker_namespace: "openstack.kolla"
-# use the published images from a site mirror of quay.io
-kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447"
 # NOTE(mgoddard): The kolla repository is copied to /tmp/kolla and made
 # readable by the stack user.
 kolla_source_url: "/tmp/kolla"

playbooks/kayobe-seed-upgrade-base/overrides.yml.j2

@@ -6,9 +6,6 @@ docker_registry_image_full: "quay.io/libpod/registry:2.8.2"
 docker_registry_mirrors:
   - "http://{{ zuul_site_mirror_fqdn }}:8082/"
 
-kolla_docker_namespace: "openstack.kolla"
-# use the published images from a site mirror of quay.io
-kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447"
 {% if not is_previous_release | default(false) %}
 kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
 kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"