From 3a6ae8d7b4ccc8ec5b3ea37f13fff47a33026d96 Mon Sep 17 00:00:00 2001 From: Luciano Lo Giudice Date: Thu, 2 May 2024 14:44:39 -0300 Subject: [PATCH] Caracal-Squid enablement for ceph-dashboard Change-Id: Iae146f2772ce80e541966791f05e979578f62e86 --- charmcraft.yaml | 6 - metadata.yaml | 2 - tests/bundles/jammy-bobcat.yaml | 10 +- ...{mantic-bobcat.yaml => jammy-caracal.yaml} | 22 ++-- tests/bundles/lunar-antelope.yaml | 114 ------------------ tests/tests.yaml | 5 +- 6 files changed, 19 insertions(+), 140 deletions(-) rename tests/bundles/{mantic-bobcat.yaml => jammy-caracal.yaml} (89%) delete mode 100644 tests/bundles/lunar-antelope.yaml diff --git a/charmcraft.yaml b/charmcraft.yaml index 0b55422..bea920d 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -32,9 +32,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 2311a69..bea2d94 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -17,8 +17,6 @@ subordinate: true series: - focal - jammy -- lunar -- mantic requires: dashboard: interface: ceph-dashboard diff --git a/tests/bundles/jammy-bobcat.yaml b/tests/bundles/jammy-bobcat.yaml index fcdd572..35bb4fe 100644 --- a/tests/bundles/jammy-bobcat.yaml +++ b/tests/bundles/jammy-bobcat.yaml @@ -10,13 +10,13 @@ applications: osd-devices: 'cinder,10G,2' options: osd-devices: '/dev/test-non-existent' - channel: latest/edge + channel: reef/edge ceph-mon: charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' - channel: latest/edge + channel: reef/edge vault: num_units: 1 charm: ch:vault @@ -59,17 +59,17 @@ applications: ceph-radosgw: charm: ch:ceph-radosgw num_units: 3 - channel: latest/edge + channel: reef/edge ceph-fs: charm: ch:ceph-fs num_units: 1 - channel: latest/edge + channel: reef/edge ceph-iscsi: charm: ch:ceph-iscsi num_units: 2 options: gateway-metadata-pool: iscsi-foo-metadata - channel: latest/edge + channel: reef/edge relations: - - 'ceph-osd:mon' - 'ceph-mon:osd' diff --git a/tests/bundles/mantic-bobcat.yaml b/tests/bundles/jammy-caracal.yaml similarity index 89% rename from tests/bundles/mantic-bobcat.yaml rename to tests/bundles/jammy-caracal.yaml index 70e356e..1ce3e1e 100644 --- a/tests/bundles/mantic-bobcat.yaml +++ b/tests/bundles/jammy-caracal.yaml @@ -1,22 +1,23 @@ local_overlay_enabled: False -series: mantic +series: jammy variables: + openstack-origin: &openstack-origin cloud:jammy-caracal source: &source distro applications: ceph-osd: charm: ch:ceph-osd - series: mantic num_units: 6 storage: osd-devices: 'cinder,10G,2' options: + source: *openstack-origin osd-devices: '/dev/test-non-existent' channel: latest/edge ceph-mon: charm: ch:ceph-mon - series: mantic num_units: 3 options: + source: *openstack-origin monitor-count: '3' channel: latest/edge vault: @@ -27,6 +28,8 @@ applications: charm: ch:mysql-innodb-cluster constraints: mem=3072M num_units: 3 + options: + source: *openstack-origin channel: latest/edge vault-mysql-router: charm: ch:mysql-router @@ -38,37 +41,38 @@ applications: prometheus: charm: ch:prometheus2 num_units: 1 - series: focal grafana: # SSL and allow_embedding are not released into cs:grafana yet, due # Octrober 2021 charm: ch:grafana num_units: 1 series: focal + channel: latest/stable options: anonymous: True install_method: snap allow_embedding: True prometheus-alertmanager: + series: focal charm: ch:prometheus-alertmanager num_units: 1 - series: focal ceph-radosgw: charm: ch:ceph-radosgw - series: mantic num_units: 3 + options: + source: *openstack-origin channel: latest/edge ceph-fs: charm: ch:ceph-fs - series: mantic num_units: 1 + options: + source: *openstack-origin channel: latest/edge ceph-iscsi: charm: ch:ceph-iscsi - # ceph-iscsi is deprecated therefore using older series. - series: jammy num_units: 2 options: + source: *openstack-origin gateway-metadata-pool: iscsi-foo-metadata channel: latest/edge relations: diff --git a/tests/bundles/lunar-antelope.yaml b/tests/bundles/lunar-antelope.yaml deleted file mode 100644 index dd2f39a..0000000 --- a/tests/bundles/lunar-antelope.yaml +++ /dev/null @@ -1,114 +0,0 @@ -local_overlay_enabled: False -series: lunar -variables: - source: &source distro -applications: - ceph-osd: - charm: ch:ceph-osd - series: lunar - num_units: 6 - storage: - osd-devices: 'cinder,10G,2' - options: - osd-devices: '/dev/test-non-existent' - channel: quincy/edge - ceph-mon: - charm: ch:ceph-mon - series: lunar - num_units: 3 - options: - monitor-count: '3' - channel: quincy/edge - vault: - num_units: 1 - charm: ch:vault - channel: 1.8/stable - series: jammy - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - constraints: mem=3072M - num_units: 3 - channel: latest/edge - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - series: jammy - ceph-dashboard: - charm: ../../ceph-dashboard.charm - options: - public-hostname: 'ceph-dashboard.zaza.local' - prometheus: - charm: ch:prometheus2 - num_units: 1 - series: focal - grafana: - # SSL and allow_embedding are not released into cs:grafana yet, due - # Octrober 2021 - charm: ch:grafana - num_units: 1 - series: focal - channel: latest/stable - options: - anonymous: True - install_method: snap - allow_embedding: True - prometheus-alertmanager: - charm: ch:prometheus-alertmanager - num_units: 1 - series: focal - ceph-radosgw: - charm: ch:ceph-radosgw - series: lunar - num_units: 3 - channel: quincy/edge - ceph-fs: - charm: ch:ceph-fs - series: lunar - num_units: 1 - channel: quincy/edge - ceph-iscsi: - charm: ch:ceph-iscsi - series: lunar - num_units: 2 - options: - gateway-metadata-pool: iscsi-foo-metadata - channel: quincy/edge -relations: - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'ceph-dashboard:dashboard' - - 'ceph-mon:dashboard' - - - 'ceph-dashboard:certificates' - - 'vault:certificates' - - - 'ceph-mon:prometheus' - - 'prometheus:target' - - - 'grafana:grafana-source' - - 'prometheus:grafana-source' - - - 'grafana:certificates' - - 'vault:certificates' - - - 'ceph-dashboard:grafana-dashboard' - - 'grafana:dashboards' - - - 'ceph-dashboard:alertmanager-service' - - 'prometheus-alertmanager:alertmanager-service' - - - 'ceph-dashboard:prometheus' - - 'prometheus:website' - - - 'prometheus:alertmanager-service' - - 'prometheus-alertmanager:alertmanager-service' - - - 'ceph-radosgw:mon' - - 'ceph-mon:radosgw' - - - 'ceph-radosgw:certificates' - - 'vault:certificates' - - - 'ceph-dashboard:radosgw-dashboard' - - 'ceph-radosgw:radosgw-user' - - - 'ceph-mon:mds' - - 'ceph-fs:ceph-mds' - - - 'ceph-mon:client' - - 'ceph-iscsi:ceph-client' - - - 'vault:certificates' - - 'ceph-iscsi:certificates' - - - 'ceph-dashboard:iscsi-dashboard' - - 'ceph-iscsi:admin-access' diff --git a/tests/tests.yaml b/tests/tests.yaml index 11721de..8852f62 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -3,7 +3,7 @@ gate_bundles: - focal - jammy - jammy-bobcat - - mantic-bobcat + - jammy-caracal smoke_bundles: - focal configure: @@ -29,6 +29,3 @@ target_deploy_status: telegraf: workload-status: active workload-status-message-prefix: Monitoring -tests_options: - force_deploy: - - mantic-bobcat