]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: don't create a unique nfs daemon name
authorMichael Fritch <mfritch@suse.com>
Mon, 9 Mar 2020 18:38:25 +0000 (12:38 -0600)
committerSage Weil <sage@redhat.com>
Thu, 26 Mar 2020 01:56:26 +0000 (20:56 -0500)
only one nfs daemon will be deployed per host

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

src/pybind/mgr/cephadm/module.py

index 829e883d3a07fc3f6a9a727f0a3c832e628e66bc..b470752f6b2b9072e02739b5c671afe2c35b0fa3 100644 (file)
@@ -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: