]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: skip Dashboard configuration if Dashboard is disabled
authorKiefer Chang <kiefer.chang@suse.com>
Fri, 31 Jul 2020 02:59:29 +0000 (10:59 +0800)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 4 Aug 2020 14:21:44 +0000 (16:21 +0200)
Fixes: https://tracker.ceph.com/issues/46045
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 95a66fed20ed71b31fa5548f50566f9ec780f298)

src/pybind/mgr/cephadm/services/cephadmservice.py

index dd5843dff15b9e64ff59f9c015f016614626e138..4af2c7e35ec1ef5182fc4527ca0415e4ee70b3f0 100644 (file)
@@ -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()