From: Redouane Kachach <rkachach@redhat.com>
Date: Wed, 25 Jan 2023 09:14:59 +0000 (+0100)
Subject: cephadm: using short hostname to create the initial mon and mgr
X-Git-Tag: v17.2.6~9^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F50445%2Fhead;p=ceph.git

cephadm: using short hostname to create the initial mon and mgr
Fixes: https://tracker.ceph.com/issues/58466

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 0b807eefb8dbccf1e25c846f8177ddb74c6f333d)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index b4f16123febb..0dc70c8e356c 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1991,6 +1991,11 @@ def get_hostname():
     return socket.gethostname()
 
 
+def get_short_hostname():
+    # type: () -> str
+    return get_hostname().split('.', 1)[0]
+
+
 def get_fqdn():
     # type: () -> str
     return socket.getfqdn() or socket.gethostname()
@@ -2003,8 +2008,8 @@ def get_arch():
 
 def generate_service_id():
     # type: () -> str
-    return get_hostname() + '.' + ''.join(random.choice(string.ascii_lowercase)
-                                          for _ in range(6))
+    return get_short_hostname() + '.' + ''.join(random.choice(string.ascii_lowercase)
+                                                for _ in range(6))
 
 
 def generate_password():
@@ -5612,7 +5617,7 @@ def command_bootstrap(ctx):
     hostname = get_hostname()
     if '.' in hostname and not ctx.allow_fqdn_hostname:
         raise Error('hostname is a fully qualified domain name (%s); either fix (e.g., "sudo hostname %s" or similar) or pass --allow-fqdn-hostname' % (hostname, hostname.split('.')[0]))
-    mon_id = ctx.mon_id or hostname
+    mon_id = ctx.mon_id or get_short_hostname()
     mgr_id = ctx.mgr_id or generate_service_id()
 
     lock = FileLock(ctx, fsid)