ceph: remove rook as a deployment option#2919
Merged
Merged
Conversation
The testbed supported deploying Ceph either via ceph-ansible or via rook (the Kubernetes operator), selected through the CEPH_STACK / ceph_stack variable. The rook path was never exercised in CI and added a parallel, kubectl-driven deployment flow that had to be kept in sync with the ceph-ansible flow. Drop rook so ceph-ansible is the single, unconditional Ceph stack. Changes: - Delete the rook-only scripts deploy/upgrade/check/100-ceph-with-rook.sh. - Collapse the "if ceph-ansible / elif rook" branches in deploy-ceph, check-ceph, upgrade-ceph and the corresponding *-services scripts so the ceph-ansible script always runs. - In deploy/000-manager.sh drop the rook-only "enable_ceph_ansible: false" override and make the ceph-ansible container health-wait unconditional; likewise in deploy-manager.sh and upgrade-manager.sh. - Remove the deploy/upgrade-ceph-with-rook symlinks. - Remove the CEPH_STACK plumbing from the top-level Makefile and playbooks/deploy.yml. The terraform/Makefile default is retained so the external terraform blueprint, which consumes ceph_stack to bake CEPH_STACK into /opt/manager-vars.sh, keeps receiving "ceph-ansible". - Drop the entire rook configuration block from environments/kubernetes/configuration.yml. - Remove the now-dead ceph_dashboard_address branch from the haproxy ceph_dashboard listener; the ceph-mgr loop becomes unconditional. - Reword rook-specific comments in playbook-wipe-partitions.yml and prepare-ceph-configuration.sh; the generic device-cleanup and LVM2 logic is shared with the ceph-ansible path and is kept as-is. The rook/issues/6865 citation URLs documenting the udev workaround are retained as provenance. The ceph-ansible script files keep their "-with-ansible" suffix to avoid churning symlinks and references. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Jan Klare <klare@osism.tech>
ideaship
approved these changes
Jul 1, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The testbed supported deploying Ceph either via ceph-ansible or via rook (the Kubernetes operator), selected through the CEPH_STACK / ceph_stack variable. The rook path was never exercised in CI and added a parallel, kubectl-driven deployment flow that had to be kept in sync with the ceph-ansible flow. Drop rook so ceph-ansible is the single, unconditional Ceph stack.
Changes:
The ceph-ansible script files keep their "-with-ansible" suffix to avoid churning symlinks and references.
Assisted-by: Claude:claude-opus-4-8