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 <mfritch@suse.com>

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index 7a90a1d25b5b69eba6c5a31b92fa1a1aef4e1476..0c33ce394a15e8ea2f75ecdce9ac7e7a476feebe 100644 (file)
--- 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)