Skip to content

ceph: remove rook as a deployment option#2919

Merged
ideaship merged 1 commit into
mainfrom
jk-remove-rook
Jul 1, 2026
Merged

ceph: remove rook as a deployment option#2919
ideaship merged 1 commit into
mainfrom
jk-remove-rook

Conversation

@jklare

@jklare jklare commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

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

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>
@jklare jklare requested a review from ideaship June 30, 2026 08:03
@jklare jklare moved this from Ready to In review in Human Board Jun 30, 2026
@ideaship ideaship merged commit 96d58f1 into main Jul 1, 2026
3 checks passed
@ideaship ideaship deleted the jk-remove-rook branch July 1, 2026 05:06
@github-project-automation github-project-automation Bot moved this from In review to Done in Human Board Jul 1, 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