feat: upgrade to OpenStack 2025.2

This upgrades every place we use OpenStack 2025.2 (or its components) to
OpenStack 2025.2 versions. Removes any settings overrides that were
necessary for 2025.1 as well. Dropped patches which are included as
well.

Author: cardoe

.github/workflows/containers.yaml

@@ -23,7 +23,7 @@ on:
     types: [checks_requested]
 
 env:
-  OPENSTACK_VERSION: 2025.1
+  OPENSTACK_VERSION: 2025.2
 
 jobs:
   openstack:

components/images-openstack.yaml

@@ -5,67 +5,67 @@ images:
 
   tags:
     # these are common across all these OpenStack Helm installations
-    bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    db_init: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
+    bootstrap: "quay.io/airshipit/heat:2025.2-ubuntu_jammy"
+    db_init: "quay.io/airshipit/heat:2025.2-ubuntu_jammy"
+    db_drop: "quay.io/airshipit/heat:2025.2-ubuntu_jammy"
+    ks_user: "quay.io/airshipit/heat:2025.2-ubuntu_jammy"
+    ks_service: "quay.io/airshipit/heat:2025.2-ubuntu_jammy"
+    ks_endpoints: "quay.io/airshipit/heat:2025.2-ubuntu_jammy"
 
     # keystone
-    keystone_api: "ghcr.io/rackerlabs/understack/keystone:2025.1-ubuntu_jammy"
-    keystone_credential_rotate: "ghcr.io/rackerlabs/understack/keystone:2025.1-ubuntu_jammy"
-    keystone_credential_setup: "ghcr.io/rackerlabs/understack/keystone:2025.1-ubuntu_jammy"
-    keystone_db_sync: "ghcr.io/rackerlabs/understack/keystone:2025.1-ubuntu_jammy"
-    keystone_domain_manage: "ghcr.io/rackerlabs/understack/keystone:2025.1-ubuntu_jammy"
-    keystone_fernet_rotate: "ghcr.io/rackerlabs/understack/keystone:2025.1-ubuntu_jammy"
-    keystone_fernet_setup: "ghcr.io/rackerlabs/understack/keystone:2025.1-ubuntu_jammy"
+    keystone_api: "ghcr.io/rackerlabs/understack/keystone:2025.2-ubuntu_jammy"
+    keystone_credential_rotate: "ghcr.io/rackerlabs/understack/keystone:2025.2-ubuntu_jammy"
+    keystone_credential_setup: "ghcr.io/rackerlabs/understack/keystone:2025.2-ubuntu_jammy"
+    keystone_db_sync: "ghcr.io/rackerlabs/understack/keystone:2025.2-ubuntu_jammy"
+    keystone_domain_manage: "ghcr.io/rackerlabs/understack/keystone:2025.2-ubuntu_jammy"
+    keystone_fernet_rotate: "ghcr.io/rackerlabs/understack/keystone:2025.2-ubuntu_jammy"
+    keystone_fernet_setup: "ghcr.io/rackerlabs/understack/keystone:2025.2-ubuntu_jammy"
 
     # ironic
-    ironic_api: "ghcr.io/rackerlabs/understack/ironic:2025.1-ubuntu_jammy"
-    ironic_conductor: "ghcr.io/rackerlabs/understack/ironic:2025.1-ubuntu_jammy"
-    ironic_pxe: "ghcr.io/rackerlabs/understack/ironic:2025.1-ubuntu_jammy"
-    ironic_pxe_init: "ghcr.io/rackerlabs/understack/ironic:2025.1-ubuntu_jammy"
+    ironic_api: "ghcr.io/rackerlabs/understack/ironic:2025.2-ubuntu_jammy"
+    ironic_conductor: "ghcr.io/rackerlabs/understack/ironic:2025.2-ubuntu_jammy"
+    ironic_pxe: "ghcr.io/rackerlabs/understack/ironic:2025.2-ubuntu_jammy"
+    ironic_pxe_init: "ghcr.io/rackerlabs/understack/ironic:2025.2-ubuntu_jammy"
     ironic_pxe_http: "docker.io/nginx:1.13.3"
-    ironic_db_sync: "ghcr.io/rackerlabs/understack/ironic:2025.1-ubuntu_jammy"
+    ironic_db_sync: "ghcr.io/rackerlabs/understack/ironic:2025.2-ubuntu_jammy"
     # these want curl which apparently is in the heat image
-    ironic_manage_cleaning_network: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ironic_retrive_cleaning_network: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    ironic_retrive_swift_config: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
+    ironic_manage_cleaning_network: "quay.io/airshipit/heat:2025.2-ubuntu_jammy"
+    ironic_retrive_cleaning_network: "quay.io/airshipit/heat:2025.2-ubuntu_jammy"
+    ironic_retrive_swift_config: "quay.io/airshipit/heat:2025.2-ubuntu_jammy"
 
     # neutron
-    neutron_db_sync: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
-    neutron_dhcp: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
-    neutron_l3: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
-    neutron_l2gw: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
-    neutron_linuxbridge_agent: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
-    neutron_metadata: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
-    neutron_ovn_metadata: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
-    neutron_openvswitch_agent: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
-    neutron_server: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
-    neutron_rpc_server: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
-    neutron_bagpipe_bgp: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
-    neutron_netns_cleanup_cron: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
+    neutron_db_sync: "ghcr.io/rackerlabs/understack/neutron:2025.2-ubuntu_jammy"
+    neutron_dhcp: "ghcr.io/rackerlabs/understack/neutron:2025.2-ubuntu_jammy"
+    neutron_l3: "ghcr.io/rackerlabs/understack/neutron:2025.2-ubuntu_jammy"
+    neutron_l2gw: "ghcr.io/rackerlabs/understack/neutron:2025.2-ubuntu_jammy"
+    neutron_linuxbridge_agent: "ghcr.io/rackerlabs/understack/neutron:2025.2-ubuntu_jammy"
+    neutron_metadata: "ghcr.io/rackerlabs/understack/neutron:2025.2-ubuntu_jammy"
+    neutron_ovn_metadata: "ghcr.io/rackerlabs/understack/neutron:2025.2-ubuntu_jammy"
+    neutron_openvswitch_agent: "ghcr.io/rackerlabs/understack/neutron:2025.2-ubuntu_jammy"
+    neutron_server: "ghcr.io/rackerlabs/understack/neutron:2025.2-ubuntu_jammy"
+    neutron_rpc_server: "ghcr.io/rackerlabs/understack/neutron:2025.2-ubuntu_jammy"
+    neutron_bagpipe_bgp: "ghcr.io/rackerlabs/understack/neutron:2025.2-ubuntu_jammy"
+    neutron_netns_cleanup_cron: "ghcr.io/rackerlabs/understack/neutron:2025.2-ubuntu_jammy"
 
     # nova
-    nova_api: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
-    nova_cell_setup: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
-    nova_cell_setup_init: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
-    nova_compute: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
-    nova_compute_ironic: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
-    nova_compute_ssh: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
-    nova_conductor: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
-    nova_db_sync: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
-    nova_novncproxy: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
-    nova_novncproxy_assets: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
-    nova_scheduler: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
-    nova_spiceproxy: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
-    nova_spiceproxy_assets: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
+    nova_api: "ghcr.io/rackerlabs/understack/nova:2025.2-ubuntu_jammy"
+    nova_cell_setup: "ghcr.io/rackerlabs/understack/nova:2025.2-ubuntu_jammy"
+    nova_cell_setup_init: "quay.io/airshipit/heat:2025.2-ubuntu_jammy"
+    nova_compute: "ghcr.io/rackerlabs/understack/nova:2025.2-ubuntu_jammy"
+    nova_compute_ironic: "ghcr.io/rackerlabs/understack/nova:2025.2-ubuntu_jammy"
+    nova_compute_ssh: "ghcr.io/rackerlabs/understack/nova:2025.2-ubuntu_jammy"
+    nova_conductor: "ghcr.io/rackerlabs/understack/nova:2025.2-ubuntu_jammy"
+    nova_db_sync: "ghcr.io/rackerlabs/understack/nova:2025.2-ubuntu_jammy"
+    nova_novncproxy: "ghcr.io/rackerlabs/understack/nova:2025.2-ubuntu_jammy"
+    nova_novncproxy_assets: "ghcr.io/rackerlabs/understack/nova:2025.2-ubuntu_jammy"
+    nova_scheduler: "ghcr.io/rackerlabs/understack/nova:2025.2-ubuntu_jammy"
+    nova_spiceproxy: "ghcr.io/rackerlabs/understack/nova:2025.2-ubuntu_jammy"
+    nova_spiceproxy_assets: "ghcr.io/rackerlabs/understack/nova:2025.2-ubuntu_jammy"
     nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
 
     # placement
-    placement: "quay.io/airshipit/placement:2025.1-ubuntu_jammy"
-    placement_db_sync: "quay.io/airshipit/placement:2025.1-ubuntu_jammy"
+    placement: "quay.io/airshipit/placement:2025.2-ubuntu_jammy"
+    placement_db_sync: "quay.io/airshipit/placement:2025.2-ubuntu_jammy"
 
     # openvswitch
     openvswitch_db_server: "docker.io/openstackhelm/openvswitch:ubuntu_jammy-dpdk-20250127"
@@ -78,35 +78,35 @@ images:
     ovn_controller: "docker.io/openstackhelm/ovn:ubuntu_jammy-20250111"
 
     # horizon
-    horizon: "quay.io/airshipit/horizon:2025.1-ubuntu_jammy"
-    horizon_db_sync: "quay.io/airshipit/horizon:2025.1-ubuntu_jammy"
+    horizon: "quay.io/airshipit/horizon:2025.2-ubuntu_jammy"
+    horizon_db_sync: "quay.io/airshipit/horizon:2025.2-ubuntu_jammy"
 
     # glance
-    glance_api: "quay.io/airshipit/glance:2025.1-ubuntu_jammy"
-    glance_db_sync: "quay.io/airshipit/glance:2025.1-ubuntu_jammy"
-    glance_metadefs_load: "quay.io/airshipit/glance:2025.1-ubuntu_jammy"
+    glance_api: "quay.io/airshipit/glance:2025.2-ubuntu_jammy"
+    glance_db_sync: "quay.io/airshipit/glance:2025.2-ubuntu_jammy"
+    glance_metadefs_load: "quay.io/airshipit/glance:2025.2-ubuntu_jammy"
     glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
 
     # skyline
     skyline: "quay.io/airshipit/skyline:latest"
     skyline_db_sync: "quay.io/airshipit/skyline:latest"
 
     # cinder
-    cinder_api: "ghcr.io/rackerlabs/understack/cinder:2025.1-ubuntu_jammy"
-    cinder_db_sync: "ghcr.io/rackerlabs/understack/cinder:2025.1-ubuntu_jammy"
-    cinder_scheduler: "ghcr.io/rackerlabs/understack/cinder:2025.1-ubuntu_jammy"
-    cinder_volume: "ghcr.io/rackerlabs/understack/cinder:2025.1-ubuntu_jammy"
-    cinder_volume_usage_audit: "ghcr.io/rackerlabs/understack/cinder:2025.1-ubuntu_jammy"
-    cinder_db_purge: "ghcr.io/rackerlabs/understack/cinder:2025.1-ubuntu_jammy"
-    cinder_backup: "ghcr.io/rackerlabs/understack/cinder:2025.1-ubuntu_jammy"
+    cinder_api: "ghcr.io/rackerlabs/understack/cinder:2025.2-ubuntu_jammy"
+    cinder_db_sync: "ghcr.io/rackerlabs/understack/cinder:2025.2-ubuntu_jammy"
+    cinder_scheduler: "ghcr.io/rackerlabs/understack/cinder:2025.2-ubuntu_jammy"
+    cinder_volume: "ghcr.io/rackerlabs/understack/cinder:2025.2-ubuntu_jammy"
+    cinder_volume_usage_audit: "ghcr.io/rackerlabs/understack/cinder:2025.2-ubuntu_jammy"
+    cinder_db_purge: "ghcr.io/rackerlabs/understack/cinder:2025.2-ubuntu_jammy"
+    cinder_backup: "ghcr.io/rackerlabs/understack/cinder:2025.2-ubuntu_jammy"
     cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
     cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
 
     # octavia
-    octavia_api: "ghcr.io/rackerlabs/understack/octavia:2025.1-ubuntu_jammy"
-    octavia_db_sync: "ghcr.io/rackerlabs/understack/octavia:2025.1-ubuntu_jammy"
-    octavia_worker: "ghcr.io/rackerlabs/understack/octavia:2025.1-ubuntu_jammy"
-    octavia_housekeeping: "ghcr.io/rackerlabs/understack/octavia:2025.1-ubuntu_jammy"
-    octavia_health_manager: "ghcr.io/rackerlabs/understack/octavia:2025.1-ubuntu_jammy"
-    octavia_health_manager_init: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
+    octavia_api: "ghcr.io/rackerlabs/understack/octavia:2025.2-ubuntu_jammy"
+    octavia_db_sync: "ghcr.io/rackerlabs/understack/octavia:2025.2-ubuntu_jammy"
+    octavia_worker: "ghcr.io/rackerlabs/understack/octavia:2025.2-ubuntu_jammy"
+    octavia_housekeeping: "ghcr.io/rackerlabs/understack/octavia:2025.2-ubuntu_jammy"
+    octavia_health_manager: "ghcr.io/rackerlabs/understack/octavia:2025.2-ubuntu_jammy"
+    octavia_health_manager_init: "quay.io/airshipit/heat:2025.2-ubuntu_jammy"
 ...

components/ironic/ironic-ks-user-baremetal.yaml

@@ -38,7 +38,7 @@ spec:
       restartPolicy: OnFailure
       containers:
       - name: ks-user-baremetal
-        image: ghcr.io/rackerlabs/understack/openstack-client:2025.1-ubuntu_jammy
+        image: ghcr.io/rackerlabs/understack/openstack-client:2025.2-ubuntu_jammy
         imagePullPolicy: Always
         command:
         - /bin/bash

components/ironic/values.yaml

@@ -22,7 +22,7 @@ conductor:
     # it is only necessary because the above pxe is disabled, its init
     # creates this path
     - name: create-tftpboot
-      image: quay.io/airshipit/heat:2025.1-ubuntu_jammy
+      image: quay.io/airshipit/heat:2025.2-ubuntu_jammy
       imagePullPolicy: IfNotPresent
       command: [bash]
       args:

components/neutron/configmap-neutron-bin.yaml

@@ -1655,18 +1655,12 @@ data:
     COMMAND="${@:-start}"
 
     function start () {
-    # (ricolin): Currently ovn have issue with uWSGI,
-    # let's keep using non-uWSGI way until this bug fixed:
-    # https://bugs.launchpad.net/neutron/+bug/1912359
-      start_ovn
-    }
+      confs="--config-file /etc/neutron/neutron.conf"
+      confs+=" --config-file /tmp/pod-shared/ovn.ini"
+      confs+=" --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
+      confs+=" --config-dir /etc/neutron/neutron.conf.d"
 
-    function start_ovn () {
-      exec neutron-server \
-            --config-file /etc/neutron/neutron.conf \
-            --config-file /tmp/pod-shared/ovn.ini \
-            --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
-            --config-dir /etc/neutron/neutron.conf.d
+      exec uwsgi --ini /etc/neutron/neutron-api-uwsgi.ini --pyargv " $confs "
     }
 
     function stop () {

components/nova/values.yaml

@@ -81,7 +81,7 @@ conf:
       api_max_retries: 90  # number of times to retry. default is 60.
       api_retry_interval: 10  # number of sesconds between retries. default is 2.
 
-    # https://docs.openstack.org/nova/2025.1/admin/scheduling.html#the-filter-scheduler
+    # https://docs.openstack.org/nova/2025.2/admin/scheduling.html#the-filter-scheduler
     filter_scheduler:
       available_filters: nova.scheduler.filters.all_filters
       enabled_filters:

components/octavia/values.yaml

@@ -52,11 +52,6 @@ conf:
       ovn_sb_connection: tcp:ovn-ovsdb-sb.openstack.svc.cluster.local:6642
     task_flow:
       jobboard_enabled: false
-  octavia_api_uwsgi:
-    uwsgi:
-      # When upgrading to 2025.2 remove this as the wsgi script was removed
-      # https://opendev.org/openstack/openstack-helm/commit/b1d85c20e36adac9eaee584ef095d9c010cc1dc4
-      wsgi-file: /var/lib/openstack/bin/octavia-wsgi
 
 dependencies:
   dynamic:

containers/ironic/Dockerfile

@@ -29,6 +29,6 @@ RUN --mount=type=cache,target=/root/.cache/pip \
       ironic-understack \
       understack-flavor-matcher \
       sushy-oem-idrac==6.0.0
-COPY containers/ironic/patches /tmp/patches/
-RUN cd /var/lib/openstack/lib/python3.10/site-packages && \
-    QUILT_PATCHES=/tmp/patches quilt push -a
+#COPY containers/ironic/patches /tmp/patches/
+#RUN cd /var/lib/openstack/lib/python3.10/site-packages && \
+#    QUILT_PATCHES=/tmp/patches quilt push -a