Skip to content

Commit f99e6c7

Browse files
committed
feat: upgrade to OpenStack 2025.1
This upgrades every place we use OpenStack 2024.2 (or its components) to OpenStack 2025.1 versions. Removed patches we pulled from 2025.1. Updated the Python pinning to ensure 3.10.x correctly. When we switch to Ubuntu Noble we'll address the bump in Python version.
1 parent 83592c0 commit f99e6c7

File tree

22 files changed

+194
-1995
lines changed

22 files changed

+194
-1995
lines changed

.github/workflows/containers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
types: [checks_requested]
2424

2525
env:
26-
OPENSTACK_VERSION: 2024.2
26+
OPENSTACK_VERSION: 2025.1
2727

2828
jobs:
2929
openstack:

components/images-openstack.yaml

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -5,67 +5,67 @@ images:
55

66
tags:
77
# these are common across all these OpenStack Helm installations
8-
bootstrap: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
9-
db_init: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
10-
db_drop: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
11-
ks_user: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
12-
ks_service: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
13-
ks_endpoints: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
8+
bootstrap: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
9+
db_init: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
10+
db_drop: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
11+
ks_user: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
12+
ks_service: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
13+
ks_endpoints: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
1414

1515
# keystone
16-
keystone_api: "ghcr.io/rackerlabs/understack/keystone:2024.2-ubuntu_jammy"
17-
keystone_credential_rotate: "ghcr.io/rackerlabs/understack/keystone:2024.2-ubuntu_jammy"
18-
keystone_credential_setup: "ghcr.io/rackerlabs/understack/keystone:2024.2-ubuntu_jammy"
19-
keystone_db_sync: "ghcr.io/rackerlabs/understack/keystone:2024.2-ubuntu_jammy"
20-
keystone_domain_manage: "ghcr.io/rackerlabs/understack/keystone:2024.2-ubuntu_jammy"
21-
keystone_fernet_rotate: "ghcr.io/rackerlabs/understack/keystone:2024.2-ubuntu_jammy"
22-
keystone_fernet_setup: "ghcr.io/rackerlabs/understack/keystone:2024.2-ubuntu_jammy"
16+
keystone_api: "ghcr.io/rackerlabs/understack/keystone:2025.1-ubuntu_jammy"
17+
keystone_credential_rotate: "ghcr.io/rackerlabs/understack/keystone:2025.1-ubuntu_jammy"
18+
keystone_credential_setup: "ghcr.io/rackerlabs/understack/keystone:2025.1-ubuntu_jammy"
19+
keystone_db_sync: "ghcr.io/rackerlabs/understack/keystone:2025.1-ubuntu_jammy"
20+
keystone_domain_manage: "ghcr.io/rackerlabs/understack/keystone:2025.1-ubuntu_jammy"
21+
keystone_fernet_rotate: "ghcr.io/rackerlabs/understack/keystone:2025.1-ubuntu_jammy"
22+
keystone_fernet_setup: "ghcr.io/rackerlabs/understack/keystone:2025.1-ubuntu_jammy"
2323

2424
# ironic
25-
ironic_api: "ghcr.io/rackerlabs/understack/ironic:2024.2-ubuntu_jammy"
26-
ironic_conductor: "ghcr.io/rackerlabs/understack/ironic:2024.2-ubuntu_jammy"
27-
ironic_pxe: "ghcr.io/rackerlabs/understack/ironic:2024.2-ubuntu_jammy"
28-
ironic_pxe_init: "ghcr.io/rackerlabs/understack/ironic:2024.2-ubuntu_jammy"
25+
ironic_api: "ghcr.io/rackerlabs/understack/ironic:2025.1-ubuntu_jammy"
26+
ironic_conductor: "ghcr.io/rackerlabs/understack/ironic:2025.1-ubuntu_jammy"
27+
ironic_pxe: "ghcr.io/rackerlabs/understack/ironic:2025.1-ubuntu_jammy"
28+
ironic_pxe_init: "ghcr.io/rackerlabs/understack/ironic:2025.1-ubuntu_jammy"
2929
ironic_pxe_http: "docker.io/nginx:1.13.3"
30-
ironic_db_sync: "ghcr.io/rackerlabs/understack/ironic:2024.2-ubuntu_jammy"
30+
ironic_db_sync: "ghcr.io/rackerlabs/understack/ironic:2025.1-ubuntu_jammy"
3131
# these want curl which apparently is in the heat image
32-
ironic_manage_cleaning_network: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
33-
ironic_retrive_cleaning_network: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
34-
ironic_retrive_swift_config: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
32+
ironic_manage_cleaning_network: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
33+
ironic_retrive_cleaning_network: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
34+
ironic_retrive_swift_config: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
3535

3636
# neutron
37-
neutron_db_sync: "ghcr.io/rackerlabs/understack/neutron:2024.2-ubuntu_jammy"
38-
neutron_dhcp: "ghcr.io/rackerlabs/understack/neutron:2024.2-ubuntu_jammy"
39-
neutron_l3: "ghcr.io/rackerlabs/understack/neutron:2024.2-ubuntu_jammy"
40-
neutron_l2gw: "ghcr.io/rackerlabs/understack/neutron:2024.2-ubuntu_jammy"
41-
neutron_linuxbridge_agent: "ghcr.io/rackerlabs/understack/neutron:2024.2-ubuntu_jammy"
42-
neutron_metadata: "ghcr.io/rackerlabs/understack/neutron:2024.2-ubuntu_jammy"
43-
neutron_ovn_metadata: "ghcr.io/rackerlabs/understack/neutron:2024.2-ubuntu_jammy"
44-
neutron_openvswitch_agent: "ghcr.io/rackerlabs/understack/neutron:2024.2-ubuntu_jammy"
45-
neutron_server: "ghcr.io/rackerlabs/understack/neutron:2024.2-ubuntu_jammy"
46-
neutron_rpc_server: "ghcr.io/rackerlabs/understack/neutron:2024.2-ubuntu_jammy"
47-
neutron_bagpipe_bgp: "ghcr.io/rackerlabs/understack/neutron:2024.2-ubuntu_jammy"
48-
neutron_netns_cleanup_cron: "ghcr.io/rackerlabs/understack/neutron:2024.2-ubuntu_jammy"
37+
neutron_db_sync: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
38+
neutron_dhcp: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
39+
neutron_l3: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
40+
neutron_l2gw: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
41+
neutron_linuxbridge_agent: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
42+
neutron_metadata: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
43+
neutron_ovn_metadata: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
44+
neutron_openvswitch_agent: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
45+
neutron_server: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
46+
neutron_rpc_server: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
47+
neutron_bagpipe_bgp: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
48+
neutron_netns_cleanup_cron: "ghcr.io/rackerlabs/understack/neutron:2025.1-ubuntu_jammy"
4949

5050
# nova
51-
nova_api: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
52-
nova_cell_setup: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
53-
nova_cell_setup_init: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
54-
nova_compute: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
55-
nova_compute_ironic: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
56-
nova_compute_ssh: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
57-
nova_conductor: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
58-
nova_db_sync: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
59-
nova_novncproxy: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
60-
nova_novncproxy_assets: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
61-
nova_scheduler: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
62-
nova_spiceproxy: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
63-
nova_spiceproxy_assets: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
51+
nova_api: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
52+
nova_cell_setup: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
53+
nova_cell_setup_init: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
54+
nova_compute: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
55+
nova_compute_ironic: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
56+
nova_compute_ssh: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
57+
nova_conductor: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
58+
nova_db_sync: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
59+
nova_novncproxy: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
60+
nova_novncproxy_assets: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
61+
nova_scheduler: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
62+
nova_spiceproxy: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
63+
nova_spiceproxy_assets: "ghcr.io/rackerlabs/understack/nova:2025.1-ubuntu_jammy"
6464
nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
6565

6666
# placement
67-
placement: "quay.io/airshipit/placement:2024.2-ubuntu_jammy"
68-
placement_db_sync: "quay.io/airshipit/placement:2024.2-ubuntu_jammy"
67+
placement: "quay.io/airshipit/placement:2025.1-ubuntu_jammy"
68+
placement_db_sync: "quay.io/airshipit/placement:2025.1-ubuntu_jammy"
6969

7070
# openvswitch
7171
openvswitch_db_server: "docker.io/openstackhelm/openvswitch:ubuntu_jammy-dpdk-20250127"
@@ -78,35 +78,35 @@ images:
7878
ovn_controller: "docker.io/openstackhelm/ovn:ubuntu_jammy-20250111"
7979

8080
# horizon
81-
horizon: "quay.io/airshipit/horizon:2024.2-ubuntu_jammy"
82-
horizon_db_sync: "quay.io/airshipit/horizon:2024.2-ubuntu_jammy"
81+
horizon: "quay.io/airshipit/horizon:2025.1-ubuntu_jammy"
82+
horizon_db_sync: "quay.io/airshipit/horizon:2025.1-ubuntu_jammy"
8383

8484
# glance
85-
glance_api: "quay.io/airshipit/glance:2024.2-ubuntu_jammy"
86-
glance_db_sync: "quay.io/airshipit/glance:2024.2-ubuntu_jammy"
87-
glance_metadefs_load: "quay.io/airshipit/glance:2024.2-ubuntu_jammy"
85+
glance_api: "quay.io/airshipit/glance:2025.1-ubuntu_jammy"
86+
glance_db_sync: "quay.io/airshipit/glance:2025.1-ubuntu_jammy"
87+
glance_metadefs_load: "quay.io/airshipit/glance:2025.1-ubuntu_jammy"
8888
glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
8989

9090
# skyline
9191
skyline: "quay.io/airshipit/skyline:latest"
9292
skyline_db_sync: "quay.io/airshipit/skyline:latest"
9393

9494
# cinder
95-
cinder_api: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
96-
cinder_db_sync: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
97-
cinder_scheduler: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
98-
cinder_volume: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
99-
cinder_volume_usage_audit: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
100-
cinder_db_purge: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
101-
cinder_backup: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
95+
cinder_api: "ghcr.io/rackerlabs/understack/cinder:2025.1-ubuntu_jammy"
96+
cinder_db_sync: "ghcr.io/rackerlabs/understack/cinder:2025.1-ubuntu_jammy"
97+
cinder_scheduler: "ghcr.io/rackerlabs/understack/cinder:2025.1-ubuntu_jammy"
98+
cinder_volume: "ghcr.io/rackerlabs/understack/cinder:2025.1-ubuntu_jammy"
99+
cinder_volume_usage_audit: "ghcr.io/rackerlabs/understack/cinder:2025.1-ubuntu_jammy"
100+
cinder_db_purge: "ghcr.io/rackerlabs/understack/cinder:2025.1-ubuntu_jammy"
101+
cinder_backup: "ghcr.io/rackerlabs/understack/cinder:2025.1-ubuntu_jammy"
102102
cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
103103
cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
104104

105105
# octavia
106-
octavia_api: "ghcr.io/rackerlabs/understack/octavia:2024.2-ubuntu_jammy"
107-
octavia_db_sync: "ghcr.io/rackerlabs/understack/octavia:2024.2-ubuntu_jammy"
108-
octavia_worker: "ghcr.io/rackerlabs/understack/octavia:2024.2-ubuntu_jammy"
109-
octavia_housekeeping: "ghcr.io/rackerlabs/understack/octavia:2024.2-ubuntu_jammy"
110-
octavia_health_manager: "ghcr.io/rackerlabs/understack/octavia:2024.2-ubuntu_jammy"
111-
octavia_health_manager_init: "docker.io/openstackhelm/heat:2024.2-ubuntu_jammy"
106+
octavia_api: "ghcr.io/rackerlabs/understack/octavia:2025.1-ubuntu_jammy"
107+
octavia_db_sync: "ghcr.io/rackerlabs/understack/octavia:2025.1-ubuntu_jammy"
108+
octavia_worker: "ghcr.io/rackerlabs/understack/octavia:2025.1-ubuntu_jammy"
109+
octavia_housekeeping: "ghcr.io/rackerlabs/understack/octavia:2025.1-ubuntu_jammy"
110+
octavia_health_manager: "ghcr.io/rackerlabs/understack/octavia:2025.1-ubuntu_jammy"
111+
octavia_health_manager_init: "quay.io/airshipit/heat:2025.1-ubuntu_jammy"
112112
...

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
restartPolicy: OnFailure
3939
containers:
4040
- name: ks-user-baremetal
41-
image: ghcr.io/rackerlabs/understack/openstack-client:2024.2-ubuntu_jammy
41+
image: ghcr.io/rackerlabs/understack/openstack-client:2025.1-ubuntu_jammy
4242
imagePullPolicy: Always
4343
command:
4444
- /bin/bash

components/ironic/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ conductor:
2222
# it is only necessary because the above pxe is disabled, its init
2323
# creates this path
2424
- name: create-tftpboot
25-
image: quay.io/airshipit/heat:2024.2-ubuntu_jammy
25+
image: quay.io/airshipit/heat:2025.1-ubuntu_jammy
2626
imagePullPolicy: IfNotPresent
2727
command: [bash]
2828
args:

0 commit comments

Comments
 (0)