openstack/charm-ceph-nfs
Code Issues Proposed changes

Caracal-Squid enablement for ceph-nfs

Browse Source 
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
This commit is contained in:
Peter Sabaini 2024-05-29 10:35:00 +02:00
parent f5e6b57787
commit 075b0fa633
9 changed files with 18 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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.
<!-- LINKS -->
[lp-bugs-charm-ceph-fs]: https://bugs.launchpad.net/charm-ceph-fs/+filebug

6
charmcraft.yaml
View File

@ -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]

2
metadata.yaml
View File

@ -11,8 +11,6 @@ tags:
series:
- focal
- jammy
- lunar
- mantic
subordinate: false
min-juju-version: 2.7.6
extra-bindings:

30
osci.yaml
View File

@ -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

47
tests/bundles/focal-pacific.yaml
View File

@ -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'

6
tests/bundles/jammy-reef.yaml
View File

@ -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

14
tests/bundles/mantic-quincy.yaml → tests/bundles/jammy-squid.yaml
View File

@ -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

47
tests/bundles/lunar-quincy.yaml
View File

@ -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'

2
tests/tests.yaml
View File

@ -4,7 +4,7 @@ gate_bundles:
- focal-pacific
- jammy-quincy
- jammy-reef
- mantic-quincy
- jammy-squid
smoke_bundles:
- focal-pacific
configure: []