File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -396,9 +396,8 @@ jobs:
396396
397397 # If testing upgrade, checkout the current release branch
398398 # Stash changes to tracked files, and set clean=false to avoid removing untracked files.
399- # Revert changes to RabbitMQ Queue types to avoid a merge conflict
400399 - name : Stash config changes
401- run : git restore etc/kayobe/environments/ci-aio/kolla/globals.yml && git stash
400+ run : git stash
402401 if : inputs.upgrade
403402
404403 - name : Checkout current release config
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ collections:
55 - name : pulp.squeezer
66 version : 0.3.0
77 - name : stackhpc.pulp
8- version : 0.6.0
8+ version : 0.6.1
99 - name : stackhpc.hashicorp
1010 version : 2.8.2
1111 - name : stackhpc.kayobe_workflows
Original file line number Diff line number Diff line change @@ -9,9 +9,20 @@ kolla_image_tags:
99 bifrost :
1010 rocky-10 : 2026.1-rocky-10-20260625T132007
1111 ubuntu-noble : 2026.1-ubuntu-noble-20260625T132007
12+ ironic_http :
13+ rocky-10 : 2026.1-rocky-10-20260724T130738
14+ ubuntu-noble : 2026.1-ubuntu-noble-20260724T130738
15+ keystone_httpd :
16+ rocky-10 : 2026.1-rocky-10-20260724T130738
17+ ubuntu-noble : 2026.1-ubuntu-noble-20260724T130738
18+ letsencrypt_webserver :
19+ rocky-10 : 2026.1-rocky-10-20260724T130738
20+ ubuntu-noble : 2026.1-ubuntu-noble-20260724T130738
1221 nova :
1322 rocky-10 : 2026.1-rocky-10-20260702T080453
1423 ubuntu-noble : 2026.1-ubuntu-noble-20260702T080453
1524 prometheus :
1625 rocky-10 : 2026.1-rocky-10-20260702T080453
1726 ubuntu-noble : 2026.1-ubuntu-noble-20260702T080453
27+ valkey :
28+ ubuntu-noble : 2026.1-ubuntu-noble-20260724T130738
Original file line number Diff line number Diff line change @@ -563,10 +563,9 @@ stackhpc_pulp_images_kolla:
563563 - heat-api-cfn
564564 - heat-engine
565565 - horizon
566- - influxdb
566+ - httpd
567567 - ironic-api
568568 - ironic-conductor
569- - ironic-inspector
570569 - ironic-neutron-agent
571570 - ironic-prometheus-exporter
572571 - ironic-pxe
@@ -577,14 +576,12 @@ stackhpc_pulp_images_kolla:
577576 - keystone-ssh
578577 - kolla-toolbox
579578 - letsencrypt-lego
580- - letsencrypt-webserver
581579 - magnum-api
582580 - magnum-conductor
583581 - manila-api
584582 - manila-data
585583 - manila-scheduler
586584 - manila-share
587- - mariadb-clustercheck
588585 - mariadb-server
589586 - memcached
590587 - multipathd
@@ -633,18 +630,12 @@ stackhpc_pulp_images_kolla:
633630 - prometheus-server
634631 - proxysql
635632 - rabbitmq
636- - rabbitmq-4-1
637- - redis
638- - redis-sentinel
639633 - valkey-server
640634 - valkey-sentinel
641635
642636# List of images for each base distribution which should not/cannot be built.
643637stackhpc_kolla_unbuildable_images :
644- rocky-9 : []
645- rocky-10 :
646- - redis
647- - redis-sentinel
638+ rocky-10 : []
648639 ubuntu-noble : []
649640
650641# Whitespace-separated list of regular expressions matching Kolla image names.
Original file line number Diff line number Diff line change 4747 "haproxy" ,
4848 "neutron_tls_proxy" ,
4949 ],
50+ "httpd" : [
51+ "ironic_http" ,
52+ "keystone_httpd" ,
53+ "letsencrypt_webserver" ,
54+ ],
5055 "mariadb-server" : [
5156 "mariadb" ,
5257 "mariabackup" ,
8590 "cron" : "common" ,
8691 "fluentd" : "common" ,
8792 "glance_tls_proxy" : "haproxy" ,
88- "hacluster_corosync" : "openstack" ,
89- "hacluster_pacemaker" : "openstack" ,
90- "hacluster_pacemaker_remote" : "openstack" ,
93+ "hacluster_pacemaker_remote" : "hacluster" ,
9194 "heat_api_cfn" : "heat" ,
9295 "ironic_neutron_agent" : "neutron" ,
96+ "ironic_pxe_filter" : "ironic" ,
9397 "kolla_toolbox" : "common" ,
9498 "neutron_eswitchd" : "neutron_mlnx_agent" ,
9599 "neutron_tls_proxy" : "haproxy" ,
98102 "redis_sentinel" : "openstack" ,
99103 "swift_object_expirer" : "swift" ,
100104 "tgtd" : "iscsi" ,
101- "valkey_sentinel" : "openstack" ,
105+ "valkey_sentinel" : "openstack" , # NOTE: Remove once https://review.opendev.org/c/openstack/kolla-ansible/+/998592 is backported to 2026.1
102106}
103107
104108# List of supported base distributions and versions.
You can’t perform that action at this time.
0 commit comments