Merge pull request #1328 from rackerlabs/bump-2025.2

feat: upgrade to OpenStack 2025.2

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:

apps/openstack/ironic.yaml

@@ -1,4 +1,4 @@
 ---
 component: ironic
 repoURL: https://tarballs.opendev.org/openstack/openstack-helm
-chartVersion: 2025.1.3+344314dd3
+chartVersion: 2025.2.0+f6be959ce

apps/openstack/octavia.yaml

@@ -1,4 +1,4 @@
 ---
 component: octavia
 repoURL: https://tarballs.opendev.org/openstack/openstack-helm
-chartVersion: 2025.1.12+80041dfbb
+chartVersion: 2025.2.3+f6be959ce

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,36 +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_driver_agent: "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/configmap-ironic-bin.yaml

@@ -302,11 +302,28 @@ data:
     set -ex
     COMMAND="${@:-start}"
 
+    cat <<'EOF' > /etc/ironic/ironic-api-uwsgi.ini
+    [uwsgi]
+    add-header = Connection: close
+    buffer-size = 65535
+    die-on-term = true
+    enable-threads = true
+    exit-on-reload = false
+    hook-master-start = unix_signal:15 gracefully_kill_them_all
+    http-socket = 0.0.0.0:6385
+    lazy-apps = true
+    log-x-forwarded-for = true
+    master = true
+    processes = 4
+    procname-prefix-spaced = ironic-api:
+    route-user-agent = ^kube-probe.* donotlog:
+    thunder-lock = true
+    worker-reload-mercy = 80
+    module = ironic.wsgi:application
+    EOF
+
     function start () {
-      exec ironic-api \
-            --config-file /etc/ironic/ironic.conf \
-            --config-dir /etc/ironic/ironic.conf.d \
-            ${OPTIONS}
+      exec uwsgi --ini /etc/ironic/ironic-api-uwsgi.ini
     }
 
     function stop () {

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/keystone/values.yaml

@@ -143,6 +143,10 @@ pod:
           - name: oidc-secret
             mountPath: /etc/oidc-secret
             readOnly: true
+          - name: keystone-bin
+            mountPath: /var/www/cgi-bin/keystone/keystone-wsgi-public
+            readOnly: true
+            subPath: wsgi.py
         volumes:
           - name: keystone-sso
             secret:

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/neutron/values.yaml

@@ -60,6 +60,10 @@ conf:
         vni_ranges: ""
   neutron:
     DEFAULT:
+      # https://docs.openstack.org/neutron/latest/admin/config-wsgi.html
+      # the api_workers set the number of uWSGI processes as well
+      api_workers: 4
+      rpc_workers: 2
       # We enable the following plugins:
       # - 'ovn-router' enables OVN to be our L3 router.
       # - 'trunk' allows for us to create and configure trunk ports to allow
@@ -96,6 +100,9 @@ conf:
     quotas:
       # https://github.com/openstack/neutron/blob/master/neutron/conf/quota.py#L101-L105
       quota_rbac_policy: 100
+  neutron_api_uwsgi:
+    uwsgi:
+      start-time: "%t"
 
 # disable the neutron-ironic-agent from loading a non-existent config
 pod:
@@ -164,6 +171,13 @@ pod:
         cpu: "200m"
       limits:
         memory: "4096Mi"
+  probes:
+    server:
+      server:
+        readiness:
+          initialDelaySeconds: 30
+          timeoutSeconds: 20
+
 
 # (nicholas.kuechler) updating the jobs list to remove the 'neutron-rabbit-init' job.
 dependencies: