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>

diff --cc src/pybind/mgr/cephadm/module.py
index 3259cf133d2b97ae89629065a646dfb1874b3381,8c977eabf1aafedc4a236ad30135c1638cb55d26..68a62bc47ac10d6fc566c3b8163692860d51f272
--- 1/src/pybind/mgr/cephadm/module.py
--- 2/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
          """

diff --cc src/pybind/mgr/cephadm/tests/test_cephadm.py
Simple merge