]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: bootstrap: name mgr with $hostname.$random
authorSage Weil <sage@redhat.com>
Fri, 31 Jan 2020 14:32:01 +0000 (08:32 -0600)
committerSage Weil <sage@redhat.com>
Sun, 2 Feb 2020 15:43:13 +0000 (09:43 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
src/cephadm/cephadm

index f2a6c9884fcfe970e767291dd332401376fb0a50..281bf62a6a463129cde524cab354bb635318a744 100755 (executable)
@@ -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