From 075b0fa6338f219754de000f91bd26015f1dde07 Mon Sep 17 00:00:00 2001 From: Peter Sabaini Date: Wed, 29 May 2024 10:35:00 +0200 Subject: [PATCH] Caracal-Squid enablement for ceph-nfs Also remove focal-pacific as there's a backward-incompat. change in charmhelpers to the ceph client broker protocol which added crush-profile parameter to pool creation. Change-Id: I16433b24c7584b22b2561fee60cbbb5fd3066e64 --- README.md | 2 + charmcraft.yaml | 6 --- metadata.yaml | 2 - osci.yaml | 30 ++---------- tests/bundles/focal-pacific.yaml | 47 ------------------- tests/bundles/jammy-reef.yaml | 6 +-- .../{mantic-quincy.yaml => jammy-squid.yaml} | 14 +++--- tests/bundles/lunar-quincy.yaml | 47 ------------------- tests/tests.yaml | 2 +- 9 files changed, 18 insertions(+), 138 deletions(-) delete mode 100644 tests/bundles/focal-pacific.yaml rename tests/bundles/{mantic-quincy.yaml => jammy-squid.yaml} (84%) delete mode 100644 tests/bundles/lunar-quincy.yaml diff --git a/README.md b/README.md index 0887907..547ad12 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,8 @@ Please report bugs on [Launchpad][lp-bugs-charm-ceph-fs]. For general charm questions refer to the OpenStack [Charm Guide][cg]. +Note that starting with the squid track of the ceph-nfs charm, deployment of Ceph Pacific and older clusters is not supported anymore. + [lp-bugs-charm-ceph-fs]: https://bugs.launchpad.net/charm-ceph-fs/+filebug diff --git a/charmcraft.yaml b/charmcraft.yaml index 71f50dd..f87b711 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -33,9 +33,3 @@ bases: - name: ubuntu channel: "22.04" architectures: [amd64, s390x, ppc64el, arm64] - - name: ubuntu - channel: "23.04" - architectures: [amd64, s390x, ppc64el, arm64] - - name: ubuntu - channel: "23.10" - architectures: [amd64, s390x, ppc64el, arm64] diff --git a/metadata.yaml b/metadata.yaml index ccab695..a252715 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -11,8 +11,6 @@ tags: series: - focal - jammy - - lunar - - mantic subordinate: false min-juju-version: 2.7.6 extra-bindings: diff --git a/osci.yaml b/osci.yaml index c3ff84e..04f68b6 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,30 +1,18 @@ - project: templates: - charm-unit-jobs-py38 - - charm-unit-jobs-py39 + - charm-unit-jobs-py310 check: jobs: - - focal-pacific - focal-quincy - jammy-quincy - jammy-reef - - lunar-quincy - - mantic-quincy + - jammy-squid vars: needs_charm_build: true charm_build_name: ceph-nfs build_type: charmcraft charmcraft_channel: 2.x/stable -- job: - name: focal-pacific - parent: func-target - dependencies: - - charm-build - - osci-lint - - tox-py38 - - tox-py39 - vars: - tox_extra_args: -- focal-pacific - job: name: focal-quincy parent: func-target @@ -32,7 +20,6 @@ - charm-build - osci-lint - tox-py38 - - tox-py39 vars: tox_extra_args: -- focal-quincy - job: @@ -50,18 +37,9 @@ vars: tox_extra_args: -- jammy-reef - job: - name: lunar-quincy + name: jammy-squid parent: func-target - voting: false dependencies: - focal-quincy vars: - tox_extra_args: -- lunar-quincy -- job: - name: mantic-quincy - parent: func-target - voting: false - dependencies: - - focal-quincy - vars: - tox_extra_args: -- mantic-quincy + tox_extra_args: -- jammy-squid diff --git a/tests/bundles/focal-pacific.yaml b/tests/bundles/focal-pacific.yaml deleted file mode 100644 index faad303..0000000 --- a/tests/bundles/focal-pacific.yaml +++ /dev/null @@ -1,47 +0,0 @@ -local_overlay_enabled: False -series: focal -applications: - ubuntu: - charm: cs:ubuntu - num_units: 2 - ceph-nfs: - charm: ../../ceph-nfs.charm - num_units: 2 - options: - source: proposed - ceph-osd: - charm: ch:ceph-osd - channel: pacific/edge - num_units: 3 - storage: - osd-devices: '2,10G' - options: - source: cloud:focal-wallaby - ceph-mon: - charm: ch:ceph-mon - channel: pacific/edge - num_units: 3 - options: - monitor-count: '3' - expected-osd-count: 6 - source: cloud:focal-wallaby - ceph-fs: - charm: ch:ceph-fs - channel: pacific/edge - num_units: 2 - options: - source: cloud:focal-wallaby - hacluster: - charm: ch:hacluster - channel: 2.0.3/edge - options: - cluster_count: 2 -relations: - - - 'ceph-mon:client' - - 'ceph-nfs:ceph-client' - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'ceph-fs' - - 'ceph-mon' - - - 'ceph-nfs:ha' - - 'hacluster:ha' diff --git a/tests/bundles/jammy-reef.yaml b/tests/bundles/jammy-reef.yaml index e0c186c..ff05761 100644 --- a/tests/bundles/jammy-reef.yaml +++ b/tests/bundles/jammy-reef.yaml @@ -14,7 +14,7 @@ applications: source: *source ceph-osd: charm: ch:ceph-osd - channel: latest/edge + channel: reef/edge num_units: 3 storage: osd-devices: '2,10G' @@ -22,7 +22,7 @@ applications: source: *source ceph-mon: charm: ch:ceph-mon - channel: latest/edge + channel: reef/edge num_units: 3 options: monitor-count: '3' @@ -30,7 +30,7 @@ applications: source: *source ceph-fs: charm: ch:ceph-fs - channel: latest/edge + channel: reef/edge num_units: 2 options: source: *source diff --git a/tests/bundles/mantic-quincy.yaml b/tests/bundles/jammy-squid.yaml similarity index 84% rename from tests/bundles/mantic-quincy.yaml rename to tests/bundles/jammy-squid.yaml index 0f8616c..2270da2 100644 --- a/tests/bundles/mantic-quincy.yaml +++ b/tests/bundles/jammy-squid.yaml @@ -1,6 +1,8 @@ +options: + source: &source cloud:jammy-caracal + local_overlay_enabled: False -series: mantic -jammy +series: jammy applications: ubuntu: charm: cs:ubuntu @@ -9,7 +11,7 @@ applications: charm: ../../ceph-nfs.charm num_units: 2 options: - source: distro + source: *source ceph-osd: charm: ch:ceph-osd channel: latest/edge @@ -17,7 +19,7 @@ applications: storage: osd-devices: '2,10G' options: - source: distro + source: *source ceph-mon: charm: ch:ceph-mon channel: latest/edge @@ -25,13 +27,13 @@ applications: options: monitor-count: '3' expected-osd-count: 6 - source: distro + source: *source ceph-fs: charm: ch:ceph-fs channel: latest/edge num_units: 2 options: - source: distro + source: *source hacluster: charm: ch:hacluster channel: 2.4/edge diff --git a/tests/bundles/lunar-quincy.yaml b/tests/bundles/lunar-quincy.yaml deleted file mode 100644 index 669cb91..0000000 --- a/tests/bundles/lunar-quincy.yaml +++ /dev/null @@ -1,47 +0,0 @@ -local_overlay_enabled: False -series: jammy -applications: - ubuntu: - charm: cs:ubuntu - num_units: 2 - ceph-nfs: - charm: ../../ceph-nfs.charm - num_units: 2 - options: - source: distro - ceph-osd: - charm: ch:ceph-osd - channel: quincy/edge - num_units: 3 - storage: - osd-devices: '2,10G' - options: - source: distro - ceph-mon: - charm: ch:ceph-mon - channel: quincy/edge - num_units: 3 - options: - monitor-count: '3' - expected-osd-count: 6 - source: distro - ceph-fs: - charm: ch:ceph-fs - channel: quincy/edge - num_units: 2 - options: - source: distro - hacluster: - charm: ch:hacluster - channel: 2.4/edge - options: - cluster_count: 2 -relations: - - - 'ceph-mon:client' - - 'ceph-nfs:ceph-client' - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'ceph-fs' - - 'ceph-mon' - - - 'ceph-nfs:ha' - - 'hacluster:ha' diff --git a/tests/tests.yaml b/tests/tests.yaml index 4660722..b435eff 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -4,7 +4,7 @@ gate_bundles: - focal-pacific - jammy-quincy - jammy-reef - - mantic-quincy + - jammy-squid smoke_bundles: - focal-pacific configure: []