From fdddd253bb640c65fc316c9c464eb9e8fa0d8af6 Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Sat, 27 Jun 2026 06:34:13 +0200 Subject: [PATCH 1/4] Remove config for six dropped kolla services Upstream kolla-ansible removed six OpenStack services and no longer defines them at any supported release (2024.1-2025.2): freezer, murano, sahara, solum, vitrage and skydive. Their OSISM config was left behind. Delete their enable flags (enable_freezer, enable_murano, enable_sahara, enable_solum, enable_vitrage, enable_skydive) and the horizon dashboard toggles for them (enable_horizon_freezer/murano/sahara/solum/vitrage) from all/099-kolla.yml, plus their dead image-definition blocks (_tag, _*_image/_tag) from all/002-images-kolla.yml. These are genuine orphans surfaced by the drift detector's kolla_enablement_orphan (enable flags) and kolla_orphan_config (companion/image vars) checks; none are OSISM inventions, and none of the removed vars are referenced anywhere else in the OSISM repos. The other orphans (senlin, ironic_pxe_uefi, outward_rabbitmq) are each a special case and are removed in separate follow-up commits. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Roger Luethi --- all/002-images-kolla.yml | 64 ---------------------------------------- all/099-kolla.yml | 11 ------- 2 files changed, 75 deletions(-) diff --git a/all/002-images-kolla.yml b/all/002-images-kolla.yml index 61558c2..af06be9 100644 --- a/all/002-images-kolla.yml +++ b/all/002-images-kolla.yml @@ -25,15 +25,6 @@ heat_api_cfn_tag: "{{ heat_tag }}" heat_engine_image: "{{ docker_image_url }}heat-engine" heat_engine_tag: "{{ heat_tag }}" -############################## -# role: murano - -murano_tag: "{{ kolla_murano_version|default(kolla_image_version) }}" -murano_api_image: "{{ docker_image_url }}murano-api" -murano_api_tag: "{{ murano_tag }}" -murano_engine_image: "{{ docker_image_url }}murano-engine" -murano_engine_tag: "{{ murano_tag }}" - ############################## # role: manila @@ -154,19 +145,6 @@ masakari_engine_tag: "{{ masakari_tag }}" masakari_monitors_image: "{{ docker_image_url }}masakari-monitors" masakari_monitors_tag: "{{ masakari_tag }}" -############################## -# role: solum - -solum_tag: "{{ kolla_solum_version|default(kolla_image_version) }}" -solum_worker_image: "{{ docker_image_url }}solum-worker" -solum_worker_tag: "{{ solum_tag }}" -solum_deployer_image: "{{ docker_image_url }}solum-deployer" -solum_deployer_tag: "{{ solum_tag }}" -solum_conductor_image: "{{ docker_image_url }}solum-conductor" -solum_conductor_tag: "{{ solum_tag }}" -solum_api_image: "{{ docker_image_url }}solum-api" -solum_api_tag: "{{ solum_tag }}" - ############################## # role: senlin @@ -193,21 +171,6 @@ keystone_ssh_tag: "{{ keystone_tag }}" keystone_httpd_image: "{{ docker_image_url }}httpd" keystone_httpd_tag: "{{ keystone_tag }}" -############################## -# role: vitrage - -vitrage_tag: "{{ kolla_vitrage_version|default(kolla_image_version) }}" -vitrage_graph_image: "{{ docker_image_url }}vitrage-graph" -vitrage_graph_tag: "{{ vitrage_tag }}" -vitrage_api_image: "{{ docker_image_url }}vitrage-api" -vitrage_api_tag: "{{ vitrage_tag }}" -vitrage_notifier_image: "{{ docker_image_url }}vitrage-notifier" -vitrage_notifier_tag: "{{ vitrage_tag }}" -vitrage_ml_image: "{{ docker_image_url }}vitrage-ml" -vitrage_ml_tag: "{{ vitrage_tag }}" -vitrage_persistor_image: "{{ docker_image_url }}vitrage-persistor" -vitrage_persistor_tag: "{{ vitrage_tag }}" - ############################## # role: vmtp @@ -252,15 +215,6 @@ cinder_backup_tag: "{{ cinder_tag }}" cinder_api_image: "{{ docker_image_url }}cinder-api" cinder_api_tag: "{{ cinder_tag }}" -############################## -# role: freezer - -freezer_tag: "{{ kolla_freezer_version|default(kolla_image_version) }}" -freezer_api_image: "{{ docker_image_url }}freezer-api" -freezer_api_tag: "{{ freezer_tag }}" -freezer_scheduler_image: "{{ docker_image_url }}freezer-scheduler" -freezer_scheduler_tag: "{{ freezer_tag }}" - ############################## # role: kibana @@ -324,15 +278,6 @@ magnum_api_tag: "{{ magnum_tag }}" magnum_conductor_image: "{{ docker_image_url }}magnum-conductor" magnum_conductor_tag: "{{ magnum_tag }}" -############################## -# role: sahara - -sahara_tag: "{{ kolla_sahara_version|default(kolla_image_version) }}" -sahara_engine_image: "{{ docker_image_url }}sahara-engine" -sahara_engine_tag: "{{ sahara_tag }}" -sahara_api_image: "{{ docker_image_url }}sahara-api" -sahara_api_tag: "{{ sahara_tag }}" - ############################## # role: loadbalancer @@ -706,15 +651,6 @@ ironic_dnsmasq_tag: "{{ kolla_dnsmasq_version|default(kolla_image_version) }}" ironic_prometheus_exporter_image: "{{ docker_image_url }}ironic-prometheus-exporter" ironic_prometheus_exporter_tag: "{{ kolla_ironic_prometheus_exporter_version|default(kolla_image_version) }}" -############################## -# role: skydive - -skydive_tag: "{{ kolla_skydive_version|default(kolla_image_version) }}" -skydive_analyzer_image: "{{ docker_image_url }}skydive-analyzer" -skydive_analyzer_tag: "{{ skydive_tag }}" -skydive_agent_image: "{{ docker_image_url }}skydive-agent" -skydive_agent_tag: "{{ skydive_tag }}" - ############################## # role: iscsi diff --git a/all/099-kolla.yml b/all/099-kolla.yml index 1b7a840..bc235ec 100644 --- a/all/099-kolla.yml +++ b/all/099-kolla.yml @@ -205,25 +205,14 @@ gnocchi_statsd_enable_healthchecks: "no" # required to be backward compatible enable_ironic_dnsmasq: "no" -enable_skydive: "no" enable_swift: "no" keystone_admin_port: "35357" keystone_admin_listen_port: "{{ keystone_admin_port }}" -enable_freezer: "no" -enable_horizon_freezer: "no" -enable_horizon_murano: "no" -enable_horizon_sahara: "no" enable_horizon_senlin: "{{ enable_senlin | bool }}" -enable_horizon_solum: "no" -enable_horizon_vitrage: "no" enable_ironic_pxe_uefi: "no" -enable_murano: "no" -enable_sahara: "no" enable_senlin: "no" -enable_solum: "no" -enable_vitrage: "no" enable_outward_rabbitmq: "no" outward_rabbitmq_external_fqdn: "{{ kolla_external_fqdn }}" From d8d596dcd15d2e1afdc51924eff7eef6085b94f9 Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Sat, 27 Jun 2026 06:40:19 +0200 Subject: [PATCH 2/4] Remove orphaned senlin config Upstream kolla-ansible removed the senlin clustering service; it is absent from enable-defaults at every supported release (2024.1-2025.2). Senlin gets its own commit because, unlike the simpler removals, it is coupled and carries companion config: enable_horizon_senlin was defined as "{{ enable_senlin | bool }}" (referencing enable_senlin, so the two must go together), and 099-kolla.yml also held senlin endpoint companion vars (senlin_internal_fqdn, senlin_external_fqdn, senlin_api_port, senlin_api_listen_port, senlin_api_public_port). Remove enable_senlin, enable_horizon_senlin and those five companion vars from all/099-kolla.yml, and the senlin image-definition block from all/002-images-kolla.yml. All removed vars were verified unreferenced elsewhere in the OSISM repos. Surfaced by the kolla_enablement_orphan and kolla_orphan_config drift checks. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Roger Luethi --- all/002-images-kolla.yml | 13 ------------- all/099-kolla.yml | 8 -------- 2 files changed, 21 deletions(-) diff --git a/all/002-images-kolla.yml b/all/002-images-kolla.yml index af06be9..bdc54e6 100644 --- a/all/002-images-kolla.yml +++ b/all/002-images-kolla.yml @@ -145,19 +145,6 @@ masakari_engine_tag: "{{ masakari_tag }}" masakari_monitors_image: "{{ docker_image_url }}masakari-monitors" masakari_monitors_tag: "{{ masakari_tag }}" -############################## -# role: senlin - -senlin_tag: "{{ kolla_senlin_version|default(kolla_image_version) }}" -senlin_conductor_image: "{{ docker_image_url }}senlin-conductor" -senlin_conductor_tag: "{{ senlin_tag }}" -senlin_engine_image: "{{ docker_image_url }}senlin-engine" -senlin_engine_tag: "{{ senlin_tag }}" -senlin_health_manager_image: "{{ docker_image_url }}senlin-health-manager" -senlin_health_manager_tag: "{{ senlin_tag }}" -senlin_api_image: "{{ docker_image_url }}senlin-api" -senlin_api_tag: "{{ senlin_tag }}" - ############################## # role: keystone diff --git a/all/099-kolla.yml b/all/099-kolla.yml index bc235ec..fa885ae 100644 --- a/all/099-kolla.yml +++ b/all/099-kolla.yml @@ -210,19 +210,11 @@ enable_swift: "no" keystone_admin_port: "35357" keystone_admin_listen_port: "{{ keystone_admin_port }}" -enable_horizon_senlin: "{{ enable_senlin | bool }}" enable_ironic_pxe_uefi: "no" -enable_senlin: "no" enable_outward_rabbitmq: "no" outward_rabbitmq_external_fqdn: "{{ kolla_external_fqdn }}" outward_rabbitmq_management_port: "15674" outward_rabbitmq_port: "5674" -senlin_internal_fqdn: "{{ kolla_internal_fqdn }}" -senlin_external_fqdn: "{{ kolla_external_fqdn }}" -senlin_api_port: "8778" -senlin_api_listen_port: "{{ senlin_api_port }}" -senlin_api_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else senlin_api_port }}" - enable_prometheus_msteams: "no" From 4a1253d14e42a46def42ac79e42ec26851ea99e5 Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Sat, 27 Jun 2026 06:41:06 +0200 Subject: [PATCH 3/4] Remove orphaned enable_ironic_pxe_uefi flag Upstream kolla-ansible no longer defines enable_ironic_pxe_uefi in its enable-defaults at any supported release (2024.1-2025.2), so the OSISM flag is orphaned. This is a flag-not-feature special case, hence its own commit: ironic PXE/UEFI provisioning itself still exists in the ironic role at 2025.2 (e.g. ansible/roles/ironic/defaults/main.yml, enable_ironic_pxe_filter, ironic-dnsmasq.conf.j2). Only this specific toggle was dropped upstream; the capability lives on under different variables. The flag has no companion or image-definition vars, so only the single line is removed from all/099-kolla.yml. Surfaced by the kolla_enablement_orphan drift check. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Roger Luethi --- all/099-kolla.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/all/099-kolla.yml b/all/099-kolla.yml index fa885ae..42470c8 100644 --- a/all/099-kolla.yml +++ b/all/099-kolla.yml @@ -210,8 +210,6 @@ enable_swift: "no" keystone_admin_port: "35357" keystone_admin_listen_port: "{{ keystone_admin_port }}" -enable_ironic_pxe_uefi: "no" - enable_outward_rabbitmq: "no" outward_rabbitmq_external_fqdn: "{{ kolla_external_fqdn }}" outward_rabbitmq_management_port: "15674" From bd79f70918cdec5628d17962f6d54d8414b43acd Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Sat, 27 Jun 2026 06:42:30 +0200 Subject: [PATCH 4/4] Remove orphaned outward_rabbitmq config Remove the whole outward_rabbitmq block from all/099-kolla.yml: the enable flag enable_outward_rabbitmq plus its three companion vars (outward_rabbitmq_external_fqdn, outward_rabbitmq_management_port, outward_rabbitmq_port). outward_rabbitmq is an OSISM-specific second ("outward") RabbitMQ deployed by OSISM wrapper playbooks on kolla-ansible's generic rabbitmq role. enable_outward_rabbitmq is absent from upstream kolla-ansible group_vars at all four supported refs (a genuine orphan), and OSISM dropped its outward_rabbitmq playbooks at 2025.1 (only the 2023.2/2024.1/ 2024.2 playbooks still reference it). Removing the enable flag is safe: the playbooks derive the tag via "enable_outward_rabbitmq | default('false') | bool" (guarded), so default deploys are unaffected. Known consequence: the 2024.1/2024.2 kolla-rabbitmq playbooks reference outward_rabbitmq_management_port and outward_rabbitmq_port without a default, so an operator who opts into outward_rabbitmq on those older releases must now set those two ports in their own site config (they already supply the other six outward_rabbitmq_* vars from secrets). Fully retiring the feature from the 2024.x playbooks is left as a separate follow-up. Surfaced by kolla_enablement_orphan (the flag) and kolla_orphan_config (the companions). Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Roger Luethi --- all/099-kolla.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/all/099-kolla.yml b/all/099-kolla.yml index 42470c8..cceb13e 100644 --- a/all/099-kolla.yml +++ b/all/099-kolla.yml @@ -210,9 +210,4 @@ enable_swift: "no" keystone_admin_port: "35357" keystone_admin_listen_port: "{{ keystone_admin_port }}" -enable_outward_rabbitmq: "no" -outward_rabbitmq_external_fqdn: "{{ kolla_external_fqdn }}" -outward_rabbitmq_management_port: "15674" -outward_rabbitmq_port: "5674" - enable_prometheus_msteams: "no"