Merge branch 'rackerlabs:main' into development

ansible/playbooks/deploy-cinder-netapp-volumes-reference.yaml

@@ -101,8 +101,8 @@
         group: root
         mode: "{{ item.mode | default('0644') }}"
       loop:
-        - src: "{{ playbook_dir }}/templates/cinder-netapp-volume.service"
-          dest: /etc/systemd/system/cinder-netapp-volume.service
+        - src: "{{ playbook_dir }}/templates/cinder-volume-netapp.service"
+          dest: /etc/systemd/system/cinder-volume-netapp.service
         - src: "{{ playbook_dir }}/templates/sudoers"
           dest: /etc/sudoers.d/cinder-volume
           mode: "0440"
@@ -142,19 +142,37 @@
         value: "{{ ansible_fqdn }}"
         create: true
 
+    - name: Create the cinder-volume-netapp configuration stage file
+      ansible.builtin.copy:
+        src: "/etc/cinder/cinder.conf.stage"
+        dest: "/etc/cinder/netapp-cinder.conf.stage"
+        owner: root
+        group: root
+        mode: "0644"
+        remote_src: true
+
     - name: Ensure the backend configuration is set to our expected value
       changed_when: false
       community.general.ini_file:
-        path: "/etc/cinder/cinder.conf.stage"
+        path: "/etc/cinder/netapp-cinder.conf.stage"
         section: DEFAULT
         option: enabled_backends
         value: "{{ cinder_backend_name }}"
         create: true
 
+    - name: Override host value in netapp-cinder.conf.stage
+      community.general.ini_file:
+        path: "/etc/cinder/netapp-cinder.conf.stage"
+        section: DEFAULT
+        option: host
+        value: cinder-volume-netapp-worker
+        mode: '0644'
+        state: present
+
     - name: Create the cinder-volume-netapp configuration
       ansible.builtin.copy:
-        src: "/etc/cinder/cinder.conf.stage"
-        dest: "/etc/cinder/cinder.conf"
+        src: "/etc/cinder/netapp-cinder.conf.stage"
+        dest: "/etc/cinder/netapp-cinder.conf"
         owner: root
         group: root
         mode: "0644"
@@ -168,12 +186,6 @@
           {% set rendered_backend = {} %}
           {% for backend in cinder_backend_name.split(',') %}
           {%   set default_backend = (_kubernetes_cinder_etc_secret.resources[0].data['backends.conf'] | b64decode | community.general.from_ini)[backend] %}
-          {%   set network_interface = hostvars[inventory_hostname][cinder_storage_network_interface]['ipv4']['address'] | default(ansible_default_ipv4.address) %}
-          {%   set network_interface_secondary = hostvars[inventory_hostname][cinder_storage_network_interface_secondary]['ipv4']['address'] %}
-          {%   set _ = default_backend.__setitem__("target_ip_address", network_interface) %}
-          {%   if (custom_multipath | bool) %}
-          {%     set _ = default_backend.__setitem__("iscsi_secondary_ip_addresses", network_interface_secondary) %}
-          {%   endif %}
           {%   set _ = rendered_backend.__setitem__(backend, default_backend) %}
           {% endfor %}
           {{ rendered_backend }}
@@ -185,18 +197,12 @@
         owner: root
         group: root
         mode: "0644"
-      notify:
-        - Restart cinder-volume-netapp systemd services
 
-    - name: Create the cinder-volume-netapp overrides configuration
-      ansible.builtin.copy:
-        content: |
-          [DEFAULT]
-          host = cinder-volume-netapp-worker
-        dest: "/etc/cinder/netapp-cinder.conf"
-        owner: root
-        group: root
-        mode: "0644"
+    - name: Replace yaml safe qos policy key in netapp-backends configuration
+      ansible.builtin.replace:
+        path: /etc/cinder/netapp-backends.conf
+        regexp: 'netapp_qos_policy_group'
+        replace: 'netapp:qos_policy_group'
       notify:
         - Restart cinder-volume-netapp systemd services
 
@@ -214,3 +220,13 @@
           value: "/etc/cinder/rootwrap.d"
       notify:
         - Restart cinder-volume-netapp systemd services
+
+    - name: Remove netapp-cinder conf staging file
+      ansible.builtin.file:
+        path: /etc/cinder/netapp-cinder.conf.stage
+        state: absent
+
+    - name: Remove cinder conf staging file
+      ansible.builtin.file:
+        path: /etc/cinder/cinder.conf.stage
+        state: absent

ansible/playbooks/deploy-cinder-volumes-reference.yaml

@@ -219,3 +219,8 @@
         owner: root
         group: root
         mode: "0644"
+
+    - name: Remove cinder conf staging file
+      ansible.builtin.file:
+        path: /etc/cinder/cinder.conf.stage
+        state: absent

ansible/playbooks/templates/cinder-volume-netapp.service

@@ -7,7 +7,7 @@ After = syslog.target
 Type = simple
 User = cinder
 Group = cinder
-ExecStart = /opt/cinder/bin/cinder-volume --config-file /etc/cinder/cinder.conf --config-file /etc/cinder/netapp-cinder.conf --config-file /etc/cinder/netapp-backends.conf
+ExecStart = /opt/cinder/bin/cinder-volume --config-file /etc/cinder/netapp-cinder.conf --config-file /etc/cinder/netapp-backends.conf
 ExecReload = /bin/kill -HUP $MAINPID
 # Give a reasonable amount of time for the server to start up/shut down
 TimeoutSec = 120

base-helm-configs/barbican/barbican-helm-overrides.yaml

@@ -35,18 +35,18 @@ helm3_hook: true
 
 images:
   tags:
-    bootstrap: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-    scripted_test: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    db_init: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    barbican_db_sync: docker.io/openstackhelm/barbican:2024.1-ubuntu_jammy
-    db_drop: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    ks_user: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    ks_service: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    ks_endpoints: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    barbican_api: docker.io/openstackhelm/barbican:2024.1-ubuntu_jammy
-    rabbit_init: docker.io/rabbitmq:3.13-management
-    image_repo_sync: docker.io/docker:17.07.0
+    bootstrap: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    dep_check: "quay.io/rackspace/rackerlabs-kubernetes-entrypoint:v1.0.0"
+    scripted_test: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    db_init: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    barbican_db_sync: "quay.io/rackspace/rackerlabs-barbican:2024.1-ubuntu_jammy"
+    db_drop: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_user: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_service: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_endpoints: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    barbican_api: "quay.io/rackspace/rackerlabs-barbican:2024.1-ubuntu_jammy"
+    rabbit_init: "quay.io/rackspace/rackerlabs-rabbitmq:3.13-management"
+    image_repo_sync: "quay.io/rackspace/rackerlabs-docker:17.07.0"
   pull_policy: "IfNotPresent"
   local_registry:
     active: false

base-helm-configs/ceilometer/ceilometer-helm-overrides.yaml

@@ -23,17 +23,17 @@ labels:
 
 images:
   tags:
-    test: docker.io/xrally/xrally-openstack:2.0.0
-    ceilometer_db_sync: ghcr.io/rackerlabs/genestack/ceilometer:2024.1-ubuntu_jammy
-    rabbit_init: docker.io/rabbitmq:3.7-management
-    ks_user: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    ks_service: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    ceilometer_central: ghcr.io/rackerlabs/genestack/ceilometer:2024.1-ubuntu_jammy
-    ceilometer_compute: ghcr.io/rackerlabs/genestack/ceilometer:2024.1-ubuntu_jammy
-    ceilometer_ipmi: ghcr.io/rackerlabs/genestack/ceilometer:2024.1-ubuntu_jammy
-    ceilometer_notification: ghcr.io/rackerlabs/genestack/ceilometer:2024.1-ubuntu_jammy
-    dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-    image_repo_sync: docker.io/docker:17.07.0
+    test: "quay.io/rackspace/rackerlabs-xrally-openstack:2.0.0"
+    ceilometer_db_sync: "quay.io/rackspace/rackerlabs-ceilometer:2024.1-ubuntu_jammy"
+    rabbit_init: "quay.io/rackspace/rackerlabs-rabbitmq:3.13-management"
+    ks_user: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_service: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ceilometer_central: "quay.io/rackspace/rackerlabs-ceilometer:2024.1-ubuntu_jammy"
+    ceilometer_compute: "quay.io/rackspace/rackerlabs-ceilometer:2024.1-ubuntu_jammy"
+    ceilometer_ipmi: "quay.io/rackspace/rackerlabs-ceilometer:2024.1-ubuntu_jammy"
+    ceilometer_notification: "quay.io/rackspace/rackerlabs-ceilometer:2024.1-ubuntu_jammy"
+    dep_check: "quay.io/rackspace/rackerlabs-kubernetes-entrypoint:v1.0.0"
+    image_repo_sync: "quay.io/rackspace/rackerlabs-docker:17.07.0"
   pull_policy: "Always"
   local_registry:
     active: false

base-helm-configs/cinder/cinder-helm-overrides.yaml

@@ -25,24 +25,24 @@ release_group: null
 
 images:
   tags:
-    db_init: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    cinder_db_sync: "docker.io/openstackhelm/cinder:2024.1-ubuntu_jammy"
-    db_drop: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    ks_user: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    ks_service: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    ks_endpoints: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    cinder_api: "docker.io/openstackhelm/cinder:2024.1-ubuntu_jammy"
-    bootstrap: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    cinder_scheduler: "docker.io/openstackhelm/cinder:2024.1-ubuntu_jammy"
-    cinder_volume: "docker.io/openstackhelm/cinder:2024.1-ubuntu_jammy"
-    cinder_volume_usage_audit: "docker.io/openstackhelm/cinder:2024.1-ubuntu_jammy"
-    cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal"
-    cinder_backup: "docker.io/openstackhelm/cinder:2024.1-ubuntu_jammy"
-    cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal"
-    test: docker.io/xrally/xrally-openstack:2.0.0
-    rabbit_init: docker.io/rabbitmq:3.7-management
-    dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-    image_repo_sync: docker.io/docker:17.07.0
+    db_init: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    cinder_db_sync: "quay.io/rackspace/rackerlabs-cinder:2024.1-ubuntu_jammy"
+    db_drop: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_user: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_service: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_endpoints: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    cinder_api: "quay.io/rackspace/rackerlabs-cinder:2024.1-ubuntu_jammy"
+    bootstrap: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    cinder_scheduler: "quay.io/rackspace/rackerlabs-cinder:2024.1-ubuntu_jammy"
+    cinder_volume: "quay.io/rackspace/rackerlabs-cinder:2024.1-ubuntu_jammy"
+    cinder_volume_usage_audit: "quay.io/rackspace/rackerlabs-cinder:2024.1-ubuntu_jammy"
+    cinder_storage_init: "quay.io/rackspace/rackerlabs-ceph-config-helper:latest-ubuntu_jammy"
+    cinder_backup: "quay.io/rackspace/rackerlabs-cinder:2024.1-ubuntu_jammy"
+    cinder_backup_storage_init: "quay.io/rackspace/rackerlabs-ceph-config-helper:latest-ubuntu_jammy"
+    test: "quay.io/rackspace/rackerlabs-xrally-openstack:2.0.0"
+    rabbit_init: "quay.io/rackspace/rackerlabs-rabbitmq:3.13-management"
+    dep_check: "quay.io/rackspace/rackerlabs-kubernetes-entrypoint:v1.0.0"
+    image_repo_sync: "quay.io/rackspace/rackerlabs-docker:17.07.0"
   pull_policy: "IfNotPresent"
   local_registry:
     active: false

base-helm-configs/designate/designate-helm-overrides.yaml

@@ -43,22 +43,22 @@ labels:
 
 images:
   tags:
-    bootstrap: docker.io/openstackhelm/heat:2023.1-ubuntu_jammy
-    db_init: docker.io/openstackhelm/heat:2023.1-ubuntu_jammy
-    db_drop: docker.io/openstackhelm/heat:2023.1-ubuntu_jammy
-    rabbit_init: docker.io/rabbitmq:3.7-management
-    ks_user: docker.io/openstackhelm/heat:2023.1-ubuntu_jammy
-    ks_service: docker.io/openstackhelm/heat:2023.1-ubuntu_jammy
-    ks_endpoints: docker.io/openstackhelm/heat:2023.1-ubuntu_jammy
-    dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-    designate_db_sync: docker.io/openstackhelm/designate:2024.1-ubuntu_jammy
-    designate_api: docker.io/openstackhelm/designate:2024.1-ubuntu_jammy
-    designate_central: docker.io/openstackhelm/designate:2024.1-ubuntu_jammy
-    designate_mdns: docker.io/openstackhelm/designate:2024.1-ubuntu_jammy
-    designate_worker: docker.io/openstackhelm/designate:2024.1-ubuntu_jammy
-    designate_producer: docker.io/openstackhelm/designate:2024.1-ubuntu_jammy
-    designate_sink: docker.io/openstackhelm/designate:2024.1-ubuntu_jammy
-    image_repo_sync: docker.io/docker:17.07.0
+    bootstrap: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    db_init: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    db_drop: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    rabbit_init: "quay.io/rackspace/rackerlabs-rabbitmq:3.13-management"
+    ks_user: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_service: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_endpoints: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    dep_check: "quay.io/rackspace/rackerlabs-kubernetes-entrypoint:v1.0.0"
+    designate_db_sync: "quay.io/rackspace/rackerlabs-designate:2024.1-ubuntu_jammy"
+    designate_api: "quay.io/rackspace/rackerlabs-designate:2024.1-ubuntu_jammy"
+    designate_central: "quay.io/rackspace/rackerlabs-designate:2024.1-ubuntu_jammy"
+    designate_mdns: "quay.io/rackspace/rackerlabs-designate:2024.1-ubuntu_jammy"
+    designate_worker: "quay.io/rackspace/rackerlabs-designate:2024.1-ubuntu_jammy"
+    designate_producer: "quay.io/rackspace/rackerlabs-designate:2024.1-ubuntu_jammy"
+    designate_sink: "quay.io/rackspace/rackerlabs-designate:2024.1-ubuntu_jammy"
+    image_repo_sync: "quay.io/rackspace/rackerlabs-docker:17.07.0"
   pull_policy: "IfNotPresent"
   local_registry:
     active: false

base-helm-configs/glance/glance-helm-overrides.yaml

@@ -16,21 +16,21 @@ release_group: null
 
 images:
   tags:
-    test: docker.io/xrally/xrally-openstack:2.0.0
-    glance_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial
-    glance_metadefs_load: "docker.io/openstackhelm/glance:2024.1-ubuntu_jammy"
-    db_init: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    glance_db_sync: "docker.io/openstackhelm/glance:2024.1-ubuntu_jammy"
-    db_drop: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    ks_user: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    ks_service: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    ks_endpoints: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    rabbit_init: docker.io/rabbitmq:3.7-management
-    glance_api: "docker.io/openstackhelm/glance:2024.1-ubuntu_jammy"
+    test: "quay.io/rackspace/rackerlabs-xrally-openstack:2.0.0"
+    glance_storage_init: "quay.io/rackspace/rackerlabs-ceph-config-helper:latest-ubuntu_jammy"
+    glance_metadefs_load: "quay.io/rackspace/rackerlabs-glance:2024.1-ubuntu_jammy"
+    db_init: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    glance_db_sync: "quay.io/rackspace/rackerlabs-glance:2024.1-ubuntu_jammy"
+    db_drop: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_user: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_service: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_endpoints: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    rabbit_init: "quay.io/rackspace/rackerlabs-rabbitmq:3.13-management"
+    glance_api: "quay.io/rackspace/rackerlabs-glance:2024.1-ubuntu_jammy"
     # Bootstrap image requires curl
-    bootstrap: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-    image_repo_sync: docker.io/docker:17.07.0
+    bootstrap: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    dep_check: "quay.io/rackspace/rackerlabs-kubernetes-entrypoint:v1.0.0"
+    image_repo_sync: "quay.io/rackspace/rackerlabs-docker:17.07.0"
   pull_policy: "IfNotPresent"
   local_registry:
     active: false

base-helm-configs/gnocchi/gnocchi-helm-overrides.yaml

@@ -36,19 +36,19 @@ release_group: null
 
 images:
   tags:
-    dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-    gnocchi_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal
-    db_init_indexer: docker.io/library/postgres:14.5
-    db_init: ghcr.io/rackerlabs/genestack/gnocchi:2024.1-ubuntu_jammy
-    db_sync: ghcr.io/rackerlabs/genestack/gnocchi:2024.1-ubuntu_jammy
-    ks_user: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    ks_service: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    ks_endpoints: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
-    gnocchi_api: ghcr.io/rackerlabs/genestack/gnocchi:2024.1-ubuntu_jammy
-    gnocchi_statsd: ghcr.io/rackerlabs/genestack/gnocchi:2024.1-ubuntu_jammy
-    gnocchi_metricd: ghcr.io/rackerlabs/genestack/gnocchi:2024.1-ubuntu_jammy
-    gnocchi_resources_cleaner: ghcr.io/rackerlabs/genestack/gnocchi:2024.1-ubuntu_jammy
-    image_repo_sync: docker.io/library/docker:17.07.0
+    dep_check: "quay.io/rackspace/rackerlabs-kubernetes-entrypoint:v1.0.0"
+    gnocchi_storage_init: "quay.io/rackspace/rackerlabs-ceph-config-helper:latest-ubuntu_jammy"
+    db_init_indexer: "quay.io/rackspace/rackerlabs-postgres:14.5"
+    db_init: "quay.io/rackspace/rackerlabs-gnocchi:2024.1-ubuntu_jammy"
+    db_sync: "quay.io/rackspace/rackerlabs-gnocchi:2024.1-ubuntu_jammy"
+    ks_user: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_service: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_endpoints: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    gnocchi_api: "quay.io/rackspace/rackerlabs-gnocchi:2024.1-ubuntu_jammy"
+    gnocchi_statsd: "quay.io/rackspace/rackerlabs-gnocchi:2024.1-ubuntu_jammy"
+    gnocchi_metricd: "quay.io/rackspace/rackerlabs-gnocchi:2024.1-ubuntu_jammy"
+    gnocchi_resources_cleaner: "quay.io/rackspace/rackerlabs-gnocchi:2024.1-ubuntu_jammy"
+    image_repo_sync: "quay.io/rackspace/rackerlabs-docker:17.07.0"
   pull_policy: "Always"
   local_registry:
     active: false

base-helm-configs/heat/heat-helm-overrides.yaml

@@ -23,23 +23,23 @@ labels:
 
 images:
   tags:
-    bootstrap: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    db_init: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    db_drop: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    ks_user: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    ks_service: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    ks_endpoints: "docker.io/openstackhelm/heat:2024.1-ubuntu_jammy"
-    heat_db_sync: "ghcr.io/rackerlabs/genestack/heat-rxt:2024.1-ubuntu_jammy"
-    heat_api: "ghcr.io/rackerlabs/genestack/heat-rxt:2024.1-ubuntu_jammy"
-    heat_cfn: "ghcr.io/rackerlabs/genestack/heat-rxt:2024.1-ubuntu_jammy"
-    heat_cloudwatch: "ghcr.io/rackerlabs/genestack/heat-rxt:2024.1-ubuntu_jammy"
-    heat_engine: "ghcr.io/rackerlabs/genestack/heat-rxt:2024.1-ubuntu_jammy"
-    heat_engine_cleaner: "ghcr.io/rackerlabs/genestack/heat-rxt:2024.1-ubuntu_jammy"
-    heat_purge_deleted: "ghcr.io/rackerlabs/genestack/heat-rxt:2024.1-ubuntu_jammy"
-    test: docker.io/xrally/xrally-openstack:2.0.0
-    rabbit_init: docker.io/rabbitmq:3.7-management
-    dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-    image_repo_sync: docker.io/docker:17.07.0
+    bootstrap: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    db_init: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    db_drop: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_user: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_service: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_endpoints: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    heat_db_sync: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    heat_api: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    heat_cfn: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    heat_cloudwatch: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    heat_engine: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    heat_engine_cleaner: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    heat_purge_deleted: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    test: "quay.io/rackspace/rackerlabs-xrally-openstack:2.0.0"
+    rabbit_init: "quay.io/rackspace/rackerlabs-rabbitmq:3.13-management"
+    dep_check: "quay.io/rackspace/rackerlabs-kubernetes-entrypoint:v1.0.0"
+    image_repo_sync: "quay.io/rackspace/rackerlabs-docker:17.07.0"
   pull_policy: "IfNotPresent"
   local_registry:
     active: false