Merge pull request #506 from stackhpc/upstream/2024.1-2025-12-08

Synchronise 2024.1 with upstream

Author: Alex-Welsh

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

@@ -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"
 # 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

@@ -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 }}"