From 95a66fed20ed71b31fa5548f50566f9ec780f298 Mon Sep 17 00:00:00 2001 From: Kiefer Chang Date: Fri, 31 Jul 2020 10:59:29 +0800 Subject: [PATCH] mgr/cephadm: skip Dashboard configuration if Dashboard is disabled Fixes: https://tracker.ceph.com/issues/46045 Signed-off-by: Kiefer Chang --- src/pybind/mgr/cephadm/services/cephadmservice.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py index dd5843dff15..4af2c7e35ec 100644 --- a/src/pybind/mgr/cephadm/services/cephadmservice.py +++ b/src/pybind/mgr/cephadm/services/cephadmservice.py @@ -97,12 +97,14 @@ class CephadmService(metaclass=ABCMeta): return cephadm_config, [] - def daemon_check_post(self, daemon_descrs: List[DaemonDescription]): """The post actions needed to be done after daemons are checked""" if self.mgr.config_dashboard: - self.config_dashboard(daemon_descrs) - + if 'dashboard' in self.mgr.get('mgr_map')['modules']: + self.config_dashboard(daemon_descrs) + else: + logger.debug('Dashboard is not enabled. Skip configuration.') + def config_dashboard(self, daemon_descrs: List[DaemonDescription]): """Config dashboard settings.""" raise NotImplementedError() -- 2.47.3