openstack/charm-ceph-fs
Code Issues Proposed changes

Caracal-Squid enablement for ceph-fs

Browse Source 
Change-Id: If2190d60c5709c9e2b6117254f9436be95a8a89e
This commit is contained in:
Luciano Lo Giudice 2024-05-02 14:53:35 -03:00
parent 8655c1b81a
commit 0aff3a6632
6 changed files with 298 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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]

294
src/build.lock Normal file
View File

@ -0,0 +1,294 @@
{
"locks": [
{
"type": "layer",
"item": "layer:options",
"url": "https://github.com/juju-solutions/layer-options.git",
"vcs": null,
"branch": "fcdcea4e5de3e1556c24e6704607862d0ba00a56",
"commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56"
},
{
"type": "layer",
"item": "layer:basic",
"url": "https://github.com/juju-solutions/layer-basic.git",
"vcs": null,
"branch": "1edd5ccd3fb6240ca734b64a7dae9f1cb30b66f6",
"commit": "1edd5ccd3fb6240ca734b64a7dae9f1cb30b66f6"
},
{
"type": "layer",
"item": "layer:openstack",
"url": "https://github.com/openstack/charm-layer-openstack",
"vcs": null,
"branch": "7c671b0696977f455616565d956895b2f890464b",
"commit": "7c671b0696977f455616565d956895b2f890464b"
},
{
"type": "layer",
"item": "layer:openstack-principle",
"url": "https://github.com/openstack/charm-layer-openstack-principle",
"vcs": null,
"branch": "2541283a7f9c3fa923c0fccd7257e217e11dadcd",
"commit": "2541283a7f9c3fa923c0fccd7257e217e11dadcd"
},
{
"type": "layer",
"item": "layer:openstack-api",
"url": "https://github.com/openstack/charm-layer-openstack-api",
"vcs": null,
"branch": "34311a62e963d0ce903b7ddb9d70b8f071f71651",
"commit": "34311a62e963d0ce903b7ddb9d70b8f071f71651"
},
{
"type": "layer",
"item": "aodh",
"url": null,
"vcs": null,
"branch": null,
"commit": ""
},
{
"type": "layer",
"item": "interface:tls-certificates",
"url": "https://github.com/juju-solutions/interface-tls-certificates",
"vcs": null,
"branch": "da891c403864482688ec767a964218e5857f0e49",
"commit": "da891c403864482688ec767a964218e5857f0e49"
},
{
"type": "layer",
"item": "interface:mysql-shared",
"url": "https://github.com/openstack/charm-interface-mysql-shared",
"vcs": null,
"branch": "f90f8c6edce21e4da3a872f0f9d6761730ce025d",
"commit": "f90f8c6edce21e4da3a872f0f9d6761730ce025d"
},
{
"type": "layer",
"item": "interface:rabbitmq",
"url": "https://github.com/openstack/charm-interface-rabbitmq",
"vcs": null,
"branch": "383121fc584d2d3bf9d233eba0d3708398a4c468",
"commit": "383121fc584d2d3bf9d233eba0d3708398a4c468"
},
{
"type": "layer",
"item": "interface:keystone",
"url": "https://github.com/openstack/charm-interface-keystone",
"vcs": null,
"branch": "36ea7b385a569ebabca7184ed4ce8420bb8fa61a",
"commit": "36ea7b385a569ebabca7184ed4ce8420bb8fa61a"
},
{
"type": "layer",
"item": "interface:hacluster",
"url": "https://github.com/openstack/charm-interface-hacluster.git",
"vcs": null,
"branch": "d91e83a1fa59a13f4160febfe536c68dc762e436",
"commit": "d91e83a1fa59a13f4160febfe536c68dc762e436"
},
{
"type": "layer",
"item": "interface:openstack-ha",
"url": "https://github.com/openstack/charm-interface-openstack-ha",
"vcs": null,
"branch": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80",
"commit": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80"
},
{
"type": "layer",
"item": "interface:mongodb",
"url": "https://github.com/cloud-green/juju-relation-mongodb",
"vcs": null,
"branch": "708b6ade852794b17447024a28e5ec2bb883538c",
"commit": "708b6ade852794b17447024a28e5ec2bb883538c"
},
{
"type": "layer",
"item": "interface:nrpe-external-master",
"url": "https://github.com/canonical/nrpe-external-master-interface",
"vcs": null,
"branch": "c58fe7b01a151d933681b5bf67e47ad3de65eeaa",
"commit": "c58fe7b01a151d933681b5bf67e47ad3de65eeaa"
},
{
"type": "python_module",
"package": "trove-classifiers",
"vcs": null,
"version": "2024.4.10"
},
{
"type": "python_module",
"package": "netifaces",
"vcs": null,
"version": "0.11.0"
},
{
"type": "python_module",
"package": "dnspython",
"vcs": null,
"version": "2.6.1"
},
{
"type": "python_module",
"package": "netaddr",
"vcs": null,
"version": "0.7.19"
},
{
"type": "python_module",
"package": "packaging",
"vcs": null,
"version": "24.0"
},
{
"type": "python_module",
"package": "pluggy",
"vcs": null,
"version": "1.5.0"
},
{
"type": "python_module",
"package": "anyio",
"vcs": null,
"version": "3.6.2"
},
{
"type": "python_module",
"package": "tomli",
"vcs": null,
"version": "2.0.1"
},
{
"type": "python_module",
"package": "pyaml",
"vcs": null,
"version": "21.10.1"
},
{
"type": "python_module",
"package": "idna",
"vcs": null,
"version": "3.7"
},
{
"type": "python_module",
"package": "calver",
"vcs": null,
"version": "2022.6.26"
},
{
"type": "python_module",
"package": "wheel",
"vcs": null,
"version": "0.43.0"
},
{
"type": "python_module",
"package": "pip",
"vcs": null,
"version": "22.0.4"
},
{
"type": "python_module",
"package": "setuptools",
"vcs": null,
"version": "62.1.0"
},
{
"type": "python_module",
"package": "psutil",
"vcs": null,
"version": "5.9.8"
},
{
"type": "python_module",
"package": "charms.openstack",
"url": "git+https://github.com/openstack/charms.openstack.git",
"branch": "stable/caracal",
"version": "018b72d734223db274b59f524b7887d8153cdb6d",
"vcs": "git"
},
{
"type": "python_module",
"package": "charmhelpers",
"url": "git+https://github.com/juju/charm-helpers.git",
"branch": "stable/caracal",
"version": "807f705d1d132bedb62b2eb743403e1d5867360f",
"vcs": "git"
},
{
"type": "python_module",
"package": "pathspec",
"vcs": null,
"version": "0.12.1"
},
{
"type": "python_module",
"package": "hatchling",
"vcs": null,
"version": "1.24.2"
},
{
"type": "python_module",
"package": "Cython",
"vcs": null,
"version": "0.29.37"
},
{
"type": "python_module",
"package": "MarkupSafe",
"vcs": null,
"version": "2.1.5"
},
{
"type": "python_module",
"package": "PyYAML",
"vcs": null,
"version": "6.0.1"
},
{
"type": "python_module",
"package": "charms.reactive",
"vcs": null,
"version": "1.5.2"
},
{
"type": "python_module",
"package": "sniffio",
"vcs": null,
"version": "1.3.0"
},
{
"type": "python_module",
"package": "setuptools_scm",
"vcs": null,
"version": "6.4.2"
},
{
"type": "python_module",
"package": "Jinja2",
"vcs": null,
"version": "3.1.3"
},
{
"type": "python_module",
"package": "pbr",
"vcs": null,
"version": "6.0.0"
},
{
"type": "python_module",
"package": "flit_scm",
"vcs": null,
"version": "1.7.0"
},
{
"type": "python_module",
"package": "flit_core",
"vcs": null,
"version": "3.9.0"
}
]
}

2
src/metadata.yaml
View File

@ -13,8 +13,6 @@ tags:
series:
- focal
- jammy
- lunar
- mantic
subordinate: false
requires:
ceph-mds:

4
src/tests/bundles/jammy-antelope.yaml
View File

@ -26,7 +26,7 @@ applications:
options:
osd-devices: '/dev/test-non-existent'
source: *openstack-origin
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
@ -34,7 +34,7 @@ applications:
options:
monitor-count: '3'
source: *openstack-origin
channel: latest/edge
channel: reef/edge
relations:
- - 'ceph-mon:mds'

4
src/tests/bundles/lunar-antelope.yaml → src/tests/bundles/jammy-caracal.yaml
View File

@ -1,9 +1,9 @@
variables:
openstack-origin: &openstack-origin distro
openstack-origin: &openstack-origin cloud:jammy-caracal
local_overlay_enabled: False
series: &series lunar
series: &series jammy
applications:
ubuntu: # used to test mounts

44
src/tests/bundles/mantic-bobcat.yaml
View File

@ -1,44 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
series: &series mantic
applications:
ubuntu: # used to test mounts
charm: ch:ubuntu
num_units: 2
ceph-fs:
charm: ../../../ceph-fs.charm
num_units: 1
options:
source: *openstack-origin
pool-type: erasure-coded
ec-profile-k: 4
ec-profile-m: 2
ceph-osd:
charm: ch:ceph-osd
num_units: 6
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/dev/test-non-existent'
source: *openstack-origin
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
monitor-count: '3'
source: *openstack-origin
channel: latest/edge
relations:
- - 'ceph-mon:mds'
- 'ceph-fs:ceph-mds'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'