From: Sage Weil <sage@redhat.com>
Date: Mon, 3 Feb 2020 22:27:51 +0000 (-0600)
Subject: Merge PR #33012 into master
X-Git-Tag: v15.1.1~566
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f61bbcdcbf520913bc727656e5deb9e7a0ce54a;p=ceph.git

Merge PR #33012 into master

* refs/pull/33012/head:
	mgr/cephadm: prefix daemon ids with hostname
	cephadm: bootstrap: name mgr with $hostname.$random

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

0f61bbcdcbf520913bc727656e5deb9e7a0ce54a
diff --cc src/pybind/mgr/cephadm/module.py
index 3259cf133d2,8c977eabf1a..68a62bc47ac
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -766,9 -732,9 +766,9 @@@ class CephadmOrchestrator(MgrModule, or
          self.event.set()
  
      def notify(self, notify_type, notify_id):
 -        self.event.set()
 +        pass
  
-     def get_unique_name(self, existing, prefix=None, forcename=None):
+     def get_unique_name(self, host, existing, prefix=None, forcename=None):
          """
          Generate a unique random service name
          """