Skip to content

Remove orphaned kolla service config#291

Merged
berendt merged 4 commits into
mainfrom
drift/remove-orphan-enable-flags
Jun 27, 2026
Merged

Remove orphaned kolla service config#291
berendt merged 4 commits into
mainfrom
drift/remove-orphan-enable-flags

Conversation

@ideaship

Copy link
Copy Markdown
Contributor

What

Remove OSISM config for OpenStack services that upstream kolla-ansible
has removed and no longer defines at any supported release
(2024.1–2025.2). The config was left behind when the services went away.

Removed across all/099-kolla.yml and all/002-images-kolla.yml:

  • Six fully-dropped servicesfreezer, murano, sahara, solum,
    vitrage, skydive: their enable_* flags, the enable_horizon_*
    dashboard toggles, and their image-definition blocks.
  • senlinenable_senlin + the coupled enable_horizon_senlin
    (defined as "{{ enable_senlin | bool }}"), its endpoint companion vars
    (senlin_internal_fqdn, senlin_external_fqdn, senlin_api_port,
    senlin_api_listen_port, senlin_api_public_port) and its image block.
  • ironic_pxe_uefi — only the orphaned enable_ironic_pxe_uefi flag;
    the PXE/UEFI capability itself still exists in the ironic role under
    different variables.
  • outward_rabbitmq — the whole block (enable_outward_rabbitmq plus
    outward_rabbitmq_external_fqdn / _management_port / _port).

Why

These are genuine orphans: each enable_* flag is absent from upstream
kolla-ansible's enable-defaults across the whole supported release range,
and the companion/image vars only existed to serve those dead services.
None are OSISM inventions, and none of the removed vars are referenced
elsewhere in the OSISM repos (verified). Surfaced by the image-drift
detector's kolla_enablement_orphan (enable flags) and
kolla_orphan_config (companion/image vars) checks. Split into one commit
per concern for review.

Note

The 2024.1/2024.2 kolla-rabbitmq playbooks still reference
outward_rabbitmq_management_port / _port without a default. Default
deploys are unaffected (the enable tag is default('false')-guarded), but
an operator opting into outward_rabbitmq on those older releases must now
set those two ports in site config (alongside the other outward_rabbitmq
secrets they already supply). Fully retiring the feature from the 2024.x
playbooks is a separate follow-up.

🤖 Generated with Claude Code

ideaship added 4 commits June 27, 2026 06:34
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
(<svc>_tag, <svc>_*_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 <luethi@osism.tech>
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 <luethi@osism.tech>
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 <luethi@osism.tech>
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 <luethi@osism.tech>
@ideaship ideaship marked this pull request as ready for review June 27, 2026 06:38
@ideaship ideaship requested a review from berendt June 27, 2026 06:38
@berendt berendt merged commit 3ea5b83 into main Jun 27, 2026
3 checks passed
@berendt berendt deleted the drift/remove-orphan-enable-flags branch June 27, 2026 08:49
@github-project-automation github-project-automation Bot moved this from Ready to Done in Human Board Jun 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants