From f21cb07c8595b403d03341f5585a607ff9eccd54 Mon Sep 17 00:00:00 2001 From: Redouane Kachach Date: Fri, 7 Feb 2025 11:52:28 +0100 Subject: [PATCH] mgr/cephadm: use get_dependencies to calculate daemon deps Signed-off-by: Redouane Kachach --- src/pybind/mgr/cephadm/services/cephadmservice.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py index 70354282a18..240253a8477 100644 --- a/src/pybind/mgr/cephadm/services/cephadmservice.py +++ b/src/pybind/mgr/cephadm/services/cephadmservice.py @@ -1283,14 +1283,10 @@ class RgwService(CephService): self.mgr.trigger_connect_dashboard_rgw() def generate_config(self, daemon_spec: CephadmDaemonDeploySpec) -> Tuple[Dict[str, Any], List[str]]: - config, deps = super().generate_config(daemon_spec) - rgw_spec = cast(RGWSpec, self.mgr.spec_store[daemon_spec.service_name].spec) - ssl_cert = getattr(rgw_spec, 'rgw_frontend_ssl_certificate', None) - if isinstance(ssl_cert, list): - ssl_cert = '\n'.join(ssl_cert) - if ssl_cert: - deps.append(str(utils.md5_hash(ssl_cert))) - return config, deps + svc_spec = cast(RGWSpec, self.mgr.spec_store[daemon_spec.service_name].spec) + config, parent_deps = super().generate_config(daemon_spec) + rgw_deps = parent_deps + self.get_dependencies(self.mgr, svc_spec) + return config, rgw_deps @register_cephadm_service -- 2.47.3