From: Michael Fritch <mfritch@suse.com>
Date: Mon, 9 Mar 2020 18:38:25 +0000 (-0600)
Subject: mgr/cephadm: don't create a unique nfs daemon name
X-Git-Tag: v15.2.1~19^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f3b789bec9f2c8bd93ec6de4b23d680243e4bf7;p=ceph.git

mgr/cephadm: don't create a unique nfs daemon name

only one nfs daemon will be deployed per host

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 81823176af101864524fc611fff346bf9798f0e0)
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 829e883d3a07f..b470752f6b2b9 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1232,7 +1232,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         Generate a unique random service name
         """
         suffix = daemon_type not in [
-            'mon', 'crash',
+            'mon', 'crash', 'nfs',
             'prometheus', 'node-exporter', 'grafana', 'alertmanager',
         ]
         if forcename: