From: Sage Weil <sage@redhat.com>
Date: Mon, 27 Jan 2020 15:47:07 +0000 (-0600)
Subject: cephadm: bootstrap: warn on fqdn hostname
X-Git-Tag: v15.1.1~515^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=957918cef275beb2946f9e21b3b93d65e6226c15;p=ceph.git

cephadm: bootstrap: warn on fqdn hostname

Things can be more confusing for the user if the hostnames are
fully-qualified (since there may be a mix of fq and not-fq).  For
bootstrap, since we are picking the mon name, warn if the hostname is
fully-qualified.

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 8a9abdc21b9b6..b6c053e1b90b0 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1596,6 +1596,8 @@ def command_bootstrap():
     # initial vars
     fsid = args.fsid or make_fsid()
     hostname = get_hostname()
+    if '.' in hostname and not args.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 = args.mon_id or hostname
     mgr_id = args.mgr_id or generate_service_id()
     logging.info('Cluster fsid: %s' % fsid)
@@ -2755,6 +2757,10 @@ def _get_parser():
         '--allow-overwrite',
         action='store_true',
         help='allow overwrite of existing --output-* config/keyring/ssh files')
+    parser_bootstrap.add_argument(
+        '--allow-fqdn-hostname',
+        action='store_true',
+        help='allow hostname that is fully-qualified (contains ".")')
 
     parser_deploy = subparsers.add_parser(
         'deploy', help='deploy a daemon')