From dd3fe082b01845d46eac72a464e1624d8a5162da Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Fri, 3 Jul 2026 22:25:02 +0200 Subject: [PATCH 1/2] kolla: drop image vars for removed services Remove 11 complete `# role:` image-catalogue blocks from all/002-images-kolla.yml, covering all 38 orphaned _image / _tag variables the release repo's kolla_image_orphan drift check reports: monasca (and every sub-image: agent, api, logstash, thresh, notification, persister, grafana), rally, vmtp, kibana, zookeeper, elasticsearch (and elasticsearch-curator), kafka, storm, panko, chrony, and qdrouterd. Every one of these services was removed from upstream kolla-ansible well before the oldest OSISM-supported release (2024.1), confirmed by kolla-ansible git history: chrony 2021-05-17 Remove chrony role rally, panko 2021-07-01 Remove rally and panko again vmtp 2021-12-20 Drop vmtp monasca-grafana 2022-03-21 Remove monasca-grafana qdrouterd 2022-04-08 drop qdrouterd support elasticsearch, kibana, curator 2022-09-09 Replace ElasticSearch and Kibana with OpenSearch monasca+deps, kafka, storm, 2023-10-02 Remove remnants of Monasca zookeeper and deps None of them is an OSISM-built image (each had an upstream role that was retired, so none meets the "OSISM image with no upstream role" bar for allowlisting), and none is consumed anywhere in OSISM -- the only zookeeper reference is Zuul's separate zuul_zookeeper_* variable. They are therefore dead catalogue entries: no deploy-side role exists to use them and no image is built for them. The result is that `check-drift.py --group all` reports zero kolla_image_orphan drift (total "to act on" drops from 101 to 61). The change also incidentally clears the two chrony image/tag entries that kolla_orphan_config flagged in this file and removes the long-standing `koll_rally_version` typo along with the dead rally block. No behaviour changes -- these variables were never evaluated for any supported release. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Roger Luethi --- all/002-images-kolla.yml | 82 ---------------------------------------- 1 file changed, 82 deletions(-) diff --git a/all/002-images-kolla.yml b/all/002-images-kolla.yml index 1e43d53..d83a69a 100644 --- a/all/002-images-kolla.yml +++ b/all/002-images-kolla.yml @@ -71,25 +71,6 @@ valkey_sentinel_tag: "{{ valkey_tag }}" # role: octavia-certificates -############################## -# role: monasca - -monasca_tag: "{{ kolla_monasca_version|default(kolla_image_version) }}" -monasca_agent_image: "{{ docker_image_url }}monasca-agent" -monasca_agent_tag: "{{ monasca_tag }}" -monasca_api_image: "{{ docker_image_url }}monasca-api" -monasca_api_tag: "{{ monasca_tag }}" -monasca_logstash_image: "{{ docker_image_url }}logstash" -monasca_logstash_tag: "{{ kolla_logstash_version|default(kolla_image_version) }}" -monasca_thresh_image: "{{ docker_image_url }}monasca-thresh" -monasca_thresh_tag: "{{ monasca_tag }}" -monasca_notification_image: "{{ docker_image_url }}monasca-notification" -monasca_notification_tag: "{{ monasca_tag }}" -monasca_persister_image: "{{ docker_image_url }}monasca-persister" -monasca_persister_tag: "{{ monasca_tag }}" -monasca_grafana_image: "{{ docker_image_url }}monasca-grafana" -monasca_grafana_tag: "{{ monasca_tag }}" - ############################## # role: mistral @@ -103,12 +84,6 @@ mistral_executor_tag: "{{ mistral_tag }}" mistral_api_image: "{{ docker_image_url }}mistral-api" mistral_api_tag: "{{ mistral_tag }}" -############################## -# role: rally - -rally_image: "{{ docker_image_url }}rally" -rally_tag: "{{ koll_rally_version|default(kolla_image_version) }}" - ############################## # role: grafana @@ -158,12 +133,6 @@ keystone_ssh_tag: "{{ keystone_tag }}" keystone_httpd_image: "{{ docker_image_url }}httpd" keystone_httpd_tag: "{{ keystone_tag }}" -############################## -# role: vmtp - -vmtp_image: "{{ docker_image_url }}vmtp" -vmtp_tag: "{{ kolla_vmtp_version|default(kolla_image_version) }}" - ############################## # role: mariadb @@ -202,12 +171,6 @@ cinder_backup_tag: "{{ cinder_tag }}" cinder_api_image: "{{ docker_image_url }}cinder-api" cinder_api_tag: "{{ cinder_tag }}" -############################## -# role: kibana - -kibana_image: "{{ docker_image_url }}kibana" -kibana_tag: "{{ kolla_kibana_version|default(kolla_image_version) }}" - ############################## # role: hacluster @@ -277,12 +240,6 @@ haproxy_ssh_tag: "{{ kolla_haproxy_ssh_version|default(kolla_image_version) }}" proxysql_image: "{{ docker_image_url }}proxysql" proxysql_tag: "{{ kolla_proxysql_version|default(kolla_image_version) }}" -############################## -# role: zookeeper - -zookeeper_image: "{{ docker_image_url }}zookeeper" -zookeeper_tag: "{{ kolla_zookeeper_version|default(kolla_image_version) }}" - ############################## # role: service-precheck @@ -298,14 +255,6 @@ watcher_api_tag: "{{ watcher_tag }}" watcher_applier_image: "{{ docker_image_url }}watcher-applier" watcher_applier_tag: "{{ watcher_tag }}" -############################## -# role: elasticsearch - -elasticsearch_image: "{{ docker_image_url }}elasticsearch" -elasticsearch_tag: "{{ kolla_elasticsearch_version|default(kolla_image_version) }}" -elasticsearch_curator_image: "{{ docker_image_url }}elasticsearch-curator" -elasticsearch_curator_tag: "{{ kolla_elasticsearch_curator_version|default(kolla_image_version) }}" - ############################## # role: glance @@ -381,18 +330,6 @@ tacker_server_tag: "{{ tacker_tag }}" tacker_conductor_image: "{{ docker_image_url }}tacker-conductor" tacker_conductor_tag: "{{ tacker_tag }}" -############################## -# role: kafka - -kafka_image: "{{ docker_image_url }}kafka" -kafka_tag: "{{ kolla_kafka_version|default(kolla_image_version) }}" - -############################## -# role: storm - -storm_image: "{{ docker_image_url }}storm" -storm_tag: "{{ kolla_storm_version|default(kolla_image_version) }}" - ############################## # role: kuryr @@ -469,13 +406,6 @@ gnocchi_statsd_tag: "{{ gnocchi_tag }}" gnocchi_metricd_image: "{{ docker_image_url }}gnocchi-metricd" gnocchi_metricd_tag: "{{ gnocchi_tag }}" -############################## -# role: panko - -panko_tag: "{{ kolla_panko_version|default(kolla_image_version) }}" -panko_api_image: "{{ docker_image_url }}panko-api" -panko_api_tag: "{{ panko_tag }}" - ############################## # role: etcd @@ -497,12 +427,6 @@ cron_tag: "{{ kolla_cron_version|default(kolla_image_version) }}" fluentd_image: "{{ docker_image_url }}fluentd" fluentd_tag: "{{ kolla_fluentd_version|default(kolla_image_version) }}" -############################## -# role: chrony - -chrony_image: "{{ docker_image_url }}chrony" -chrony_tag: "{{ kolla_chrony_version|default(kolla_image_version) }}" - ############################## # role: placement @@ -553,12 +477,6 @@ ovsdpdk_db_tag: "{{ ovsdpdk_tag }}" ovsdpdk_vswitchd_image: "{{ docker_image_url }}ovsdpdk-vswitchd" ovsdpdk_vswitchd_tag: "{{ ovsdpdk_tag }}" -############################## -# role: qdrouterd - -qdrouterd_image: "{{ docker_image_url }}qdrouterd" -qdrouterd_tag: "{{ kolla_qdrouterd_version|default(kolla_image_version) }}" - ############################## # role: ovn From 492b58a2f7e98d666966f2d914436289928e99e9 Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Fri, 3 Jul 2026 23:24:13 +0200 Subject: [PATCH 2/2] kolla: drop karbor/qinling/searchlight flags Remove six orphaned enable flags from all/003-kolla-overlays.yml: enable_karbor, enable_qinling, enable_searchlight and their enable_horizon_karbor / enable_horizon_qinling / enable_horizon_searchlight horizon toggles. Karbor, Qinling and Searchlight are retired OpenStack projects that upstream kolla-ansible removed in 2020 (Karbor 25b9de91a 2020-12-17, Qinling dafde93fe and Searchlight c7386a816 both 2020-11-28), well before the oldest OSISM-supported release. The drift check kolla_enablement_orphan reports these flags as orphaned. They were all set to "no" and have no live consumer anywhere in OSISM (the only other references are dead karbor_*/searchlight_* entries in testbed's auto-generated secrets superset), so removing them changes no behaviour. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Roger Luethi --- all/003-kolla-overlays.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/all/003-kolla-overlays.yml b/all/003-kolla-overlays.yml index 870b2b9..4863a76 100644 --- a/all/003-kolla-overlays.yml +++ b/all/003-kolla-overlays.yml @@ -1,14 +1,6 @@ --- -enable_karbor: "no" -enable_qinling: "no" -enable_searchlight: "no" - enable_prometheus: "yes" -enable_horizon_karbor: "no" -enable_horizon_qinling: "no" -enable_horizon_searchlight: "no" - ceph_glance_user: glance ceph_glance_pool_name: images