openstack/charm-ceph-dashboard
Code Issues Proposed changes

Adds dashboard enablement/deferral logic improvements

Browse Source 
Closes-Bug: 2033886
Change-Id: I2f4d4dfa890fc79f7f5d5b1273a11907b60e8255
Signed-off-by: Utkarsh Bhatt <utkarsh.bhatt@canonical.com>
This commit is contained in:
Utkarsh Bhatt
2023-09-01 13:11:41 +05:30
parent d617766c31
commit 33f60aea09
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/charm.py
View File

@@ -370,7 +370,7 @@ class CephDashboardCharm(ops_openstack.core.OSBaseCharm):
),
)
def _configure_dashboard(self, event) -> None:
def _configure_dashboard(self, _event) -> None:
"""Configure dashboard"""
if not self.mon.mons_ready:
logging.info("Not configuring dashboard, mons not ready")
@@ -726,8 +726,15 @@ class CephDashboardCharm(ops_openstack.core.OSBaseCharm):
self._configure_tls(key, cert, ca_cert, self.TLS_VAULT_CA_CERT_PATH)
# Custom SSL Event Handles
def _enable_ssl_from_config(self, _event) -> None:
def _enable_ssl_from_config(self, event) -> None:
"""Configure Ceph Dashboard SSL with available key/cert from charm."""
if not ceph_utils.is_dashboard_enabled():
if self.unit.is_leader():
ceph_utils.mgr_enable_dashboard()
else:
event.defer()
return
if all([
cmds.check_ceph_dashboard_ssl_configured(),
cmds.check_ceph_dashboard_ssl_configured(is_check_host_key=True)
@@ -740,6 +747,13 @@ class CephDashboardCharm(ops_openstack.core.OSBaseCharm):
# Certificates relation handle.
def _enable_ssl_from_relation(self, event) -> None:
"""Configure Ceph Dashboard SSL using key/cert from relation."""
if not ceph_utils.is_dashboard_enabled():
if self.unit.is_leader():
ceph_utils.mgr_enable_dashboard()
else:
event.defer()
return
if cmds.check_ceph_dashboard_ssl_configured():
key, cert, _ = self._get_tls_from_config()
if self.is_ceph_dashboard_ssl_key_cert_same(key, cert):