From 2fff119e340dd0feb014c68cd64c2f6f96fcf542 Mon Sep 17 00:00:00 2001 From: Luciano Lo Giudice Date: Thu, 2 May 2024 14:53:35 -0300 Subject: [PATCH] Caracal-Squid enablement for ceph-fs Change-Id: If2190d60c5709c9e2b6117254f9436be95a8a89e func-test-pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/1205 --- charmcraft.yaml | 6 - src/build.lock | 294 ++++++++++++++++++ src/metadata.yaml | 2 - src/tests/bundles/jammy-antelope.yaml | 4 +- ...lunar-antelope.yaml => jammy-caracal.yaml} | 4 +- src/tests/bundles/mantic-bobcat.yaml | 44 --- 6 files changed, 298 insertions(+), 56 deletions(-) create mode 100644 src/build.lock rename src/tests/bundles/{lunar-antelope.yaml => jammy-caracal.yaml} (90%) delete mode 100644 src/tests/bundles/mantic-bobcat.yaml diff --git a/charmcraft.yaml b/charmcraft.yaml index 3683b39..242452c 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/src/build.lock b/src/build.lock new file mode 100644 index 0000000..220ef7c --- /dev/null +++ b/src/build.lock @@ -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" + } + ] +} \ No newline at end of file diff --git a/src/metadata.yaml b/src/metadata.yaml index e20f31f..919002e 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -13,8 +13,6 @@ tags: series: - focal - jammy -- lunar -- mantic subordinate: false requires: ceph-mds: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml index b75c350..dfab58f 100644 --- a/src/tests/bundles/jammy-antelope.yaml +++ b/src/tests/bundles/jammy-antelope.yaml @@ -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' diff --git a/src/tests/bundles/lunar-antelope.yaml b/src/tests/bundles/jammy-caracal.yaml similarity index 90% rename from src/tests/bundles/lunar-antelope.yaml rename to src/tests/bundles/jammy-caracal.yaml index 35d64bc..82ad470 100644 --- a/src/tests/bundles/lunar-antelope.yaml +++ b/src/tests/bundles/jammy-caracal.yaml @@ -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 diff --git a/src/tests/bundles/mantic-bobcat.yaml b/src/tests/bundles/mantic-bobcat.yaml deleted file mode 100644 index 3456d8c..0000000 --- a/src/tests/bundles/mantic-bobcat.yaml +++ /dev/null @@ -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'