From: Michael Fritch Date: Wed, 3 Mar 2021 22:44:26 +0000 (-0700) Subject: mgr/cephadm: alias rgw-nfs -> nfs X-Git-Tag: v16.2.0~106^2~109 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f5439013171b9fb9154a3b3757ed48284c6da892;p=ceph.git 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 (cherry picked from commit 0f237223accbea49cf9792400a657cbf696a5d67) --- diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index 82d4e8e25a9..3197159a199 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -404,6 +404,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)