From: Michael Fritch <mfritch@suse.com>
Date: Fri, 12 Mar 2021 17:23:01 +0000 (-0700)
Subject: mgr/cephadm: alias rgw-nfs -> nfs
X-Git-Tag: v15.2.13~13^2~21^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=59bd8a4f5930e02e610150c82bdd72372ba9179a;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 <mfritch@suse.com>
(cherry picked from commit 0f237223accbea49cf9792400a657cbf696a5d67)
---

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index d2563d232370..01e9c4315ee2 100644
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -369,6 +369,9 @@ class CephadmServe:
                         else:
                             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 = s.get('id').split('-rgw')[0]
 
                     if host not in self.mgr.inventory:
                         missing_names.append(name)
@@ -676,4 +679,3 @@ class CephadmServe:
             msg = f'host {host} `cephadm {command}` failed: Cannot decode JSON'
             self.log.exception(f'{msg}: {"".join(out)}')
             raise OrchestratorError(msg)
-