From 1079ad6f60de3b8c557274fc2fe4199753b69276 Mon Sep 17 00:00:00 2001 From: Nicolas Bock Date: Tue, 7 Nov 2023 13:39:23 +0200 Subject: [PATCH] Add ceph-dashboard option Closes: canonical/stsstack-bundles#148 Signed-off-by: Nicolas Bock --- common/charm_lists | 1 + openstack/pipeline/02configure | 9 +++++++++ overlays/ceph/ceph-dashboard.yaml | 10 ++++++++++ 3 files changed, 20 insertions(+) create mode 100644 overlays/ceph/ceph-dashboard.yaml diff --git a/common/charm_lists b/common/charm_lists index 843ccdbf..aa19f83f 100644 --- a/common/charm_lists +++ b/common/charm_lists @@ -49,6 +49,7 @@ ovn-dedicated-chassis ) declare -a CEPH_CHARMS=( +ceph-dashboard ceph-fs ceph-iscsi ceph-mon diff --git a/openstack/pipeline/02configure b/openstack/pipeline/02configure index 49b81771..ad5e60e7 100644 --- a/openstack/pipeline/02configure +++ b/openstack/pipeline/02configure @@ -183,6 +183,15 @@ do MOD_OVERLAYS+=( "ceph/ceph-fs.yaml" ) set -- $@ --ceph-fs && cache $@ ;; + --ceph-dashboard) + MOD_OVERLAYS+=( "ceph/ceph-dashboard.yaml" ) + if ! has_opt --ceph; then + set -- $@ --ceph && cache $@ + fi + if ! has_opt --vault; then + set -- $@ --vault && cache $@ + fi + ;; --designate) assert_min_release ocata "designate" msg="REQUIRED: designate-bind upstream dns server to forward requests to:" diff --git a/overlays/ceph/ceph-dashboard.yaml b/overlays/ceph/ceph-dashboard.yaml new file mode 100644 index 00000000..4e69fa1e --- /dev/null +++ b/overlays/ceph/ceph-dashboard.yaml @@ -0,0 +1,10 @@ +debug: &debug True + +applications: + ceph-dashboard: + charm: __CHARM_STORE____CHARM_CS_NS____CHARM_CH_PREFIX__ceph-dashboard + options: + debug: *debug +relations: + - [ ceph-dashboard:dashboard, ceph-mon:dashboard ] + - [ ceph-dashboard:certificates, vault:certificates ]