Skip to content

Commit f21cb07

Browse files
committed
mgr/cephadm: use get_dependencies to calculate daemon deps
Signed-off-by: Redouane Kachach <[email protected]>
1 parent 8dbc5f8 commit f21cb07

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,14 +1283,10 @@ def config_dashboard(self, daemon_descrs: List[DaemonDescription]) -> None:
12831283
self.mgr.trigger_connect_dashboard_rgw()
12841284

12851285
def generate_config(self, daemon_spec: CephadmDaemonDeploySpec) -> Tuple[Dict[str, Any], List[str]]:
1286-
config, deps = super().generate_config(daemon_spec)
1287-
rgw_spec = cast(RGWSpec, self.mgr.spec_store[daemon_spec.service_name].spec)
1288-
ssl_cert = getattr(rgw_spec, 'rgw_frontend_ssl_certificate', None)
1289-
if isinstance(ssl_cert, list):
1290-
ssl_cert = '\n'.join(ssl_cert)
1291-
if ssl_cert:
1292-
deps.append(str(utils.md5_hash(ssl_cert)))
1293-
return config, deps
1286+
svc_spec = cast(RGWSpec, self.mgr.spec_store[daemon_spec.service_name].spec)
1287+
config, parent_deps = super().generate_config(daemon_spec)
1288+
rgw_deps = parent_deps + self.get_dependencies(self.mgr, svc_spec)
1289+
return config, rgw_deps
12941290

12951291

12961292
@register_cephadm_service

0 commit comments

Comments
 (0)