From: Sage Weil <sage@redhat.com>
Date: Fri, 31 Jan 2020 14:32:01 +0000 (-0600)
Subject: cephadm: bootstrap: name mgr with $hostname.$random
X-Git-Tag: v15.1.1~566^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=128095c219ca8ed307e2de90b44c8393e383a2cc;p=ceph.git

cephadm: bootstrap: name mgr with $hostname.$random

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index f2a6c9884fcf..281bf62a6a46 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -626,8 +626,8 @@ def get_fqdn():
 
 def generate_service_id():
     # type: () -> str
-    return ''.join(random.choice(string.ascii_lowercase)
-                   for _ in range(6))
+    return get_hostname() + '.' + ''.join(random.choice(string.ascii_lowercase)
+                                          for _ in range(6))
 
 def generate_password():
     # type: () -> str