From 9da7f5a82064a3d13ba5d9f6f32feefe2650aa73 Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Wed, 12 Nov 2025 17:29:14 +0100 Subject: [PATCH 1/3] Add Tentacle support --- CHANGELOG.rst | 8 ++++++++ changelogs/changelog.yaml | 5 +++++ galaxy.yml | 2 +- roles/cephadm/vars/main.yml | 1 + 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f7121b1..0f68498 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,14 @@ stackhpc.cephadm Release Notes .. contents:: Topics +v1.22.0 +======= + +Minor Changes +------------- + +- Add Tentacle support + v1.21.1 ======= diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 45b9255..ab659bc 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -39,3 +39,8 @@ releases: - prechecks - change groups existence check to run once - prechecks - fix groups existing assertion release_date: '2025-11-12' + 1.22.0: + changes: + minor_changes: + - Add Tentacle support + release_date: '2025-11-12' diff --git a/galaxy.yml b/galaxy.yml index baabbad..9e70b07 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -1,6 +1,6 @@ namespace: "stackhpc" name: "cephadm" -version: "1.21.1" +version: "1.22.0" readme: "README.md" authors: - "Michal Nasiadka" diff --git a/roles/cephadm/vars/main.yml b/roles/cephadm/vars/main.yml index f544471..684b06d 100644 --- a/roles/cephadm/vars/main.yml +++ b/roles/cephadm/vars/main.yml @@ -6,5 +6,6 @@ cephadm_ceph_releases: - quincy - reef - squid + - tentacle cephadm_apt_key_url: "https://download.ceph.com/keys/release.asc" cephadm_apt_key_path: "/usr/local/share/keyrings/ceph.asc" From cc6f07b4df9b0f3334473bf548a1b7b64eb565dd Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Wed, 12 Nov 2025 18:59:37 +0100 Subject: [PATCH 2/3] Add Tentacle CI jobs --- zuul.d/jobs.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index c5ac450..9aa794c 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -84,6 +84,20 @@ cephadm_ceph_release: squid cephadm_container_engine: podman +- job: + name: cephadm-noble-multinode-docker-tentacle + parent: .cephadm-noble-multinode-template + vars: + cephadm_ceph_release: tentacle + cephadm_container_engine: docker + +- job: + name: cephadm-noble-multinode-podman-tentacle + parent: .cephadm-noble-multinode-template + vars: + cephadm_ceph_release: tentacle + cephadm_container_engine: podman + # Rocky 9 - job: @@ -113,3 +127,17 @@ vars: cephadm_ceph_release: squid cephadm_container_engine: podman + +- job: + name: cephadm-rocky9-multinode-docker-tentacle + parent: .cephadm-rocky9-multinode-template + vars: + cephadm_ceph_release: tentacle + cephadm_container_engine: docker + +- job: + name: cephadm-rocky9-multinode-podman-tentacle + parent: .cephadm-rocky9-multinode-template + vars: + cephadm_ceph_release: tentacle + cephadm_container_engine: podman From 4eca5e25f511c07957fef88f8bf5ae033e861bf7 Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Wed, 12 Nov 2025 21:25:44 +0100 Subject: [PATCH 3/3] CI: Don't attempt to bootstrap PIP on Rocky --- tests/playbooks/pre.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/playbooks/pre.yml b/tests/playbooks/pre.yml index c7c9183..8e4fb22 100644 --- a/tests/playbooks/pre.yml +++ b/tests/playbooks/pre.yml @@ -6,7 +6,8 @@ logs_dir: "/tmp/logs" roles: - ensure-output-dirs - - ensure-pip + - role: "ensure-pip" + when: ansible_facts.distribution == "Ubuntu" - role: "ensure-docker" when: cephadm_container_engine == "docker" - role: "ensure-podman"