From 0f237223accbea49cf9792400a657cbf696a5d67 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Wed, 3 Mar 2021 15:44:26 -0700 Subject: [PATCH] mgr/cephadm: alias rgw-nfs -> nfs RGW will register a daemon_type `rgw-nfs` which needs to map to the corresponding cephadm nfs daemon to avoid stray daemon warnings Fixes: https://tracker.ceph.com/issues/49573 Signed-off-by: Michael Fritch --- src/pybind/mgr/cephadm/serve.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index 7a90a1d25b5b..0c33ce394a15 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -405,6 +405,9 @@ class CephadmServe: except (KeyError, TypeError): self.log.debug( "Failed to find daemon id for rbd-mirror service %s" % (s.get('id'))) + elif s.get('type') == 'rgw-nfs': + # https://tracker.ceph.com/issues/49573 + name = daemon_id.split('-rgw')[0] if host not in self.mgr.inventory: missing_names.append(name) -- 2.47.3