Revision ff98055b

b/lib/cmdlib.py
540 540
      raise errors.OpPrereqError("Cannot resolve my own hostname ('%s')" %
541 541
                                 hostname_local)
542 542

  
543
    if hostname["hostname_full"] != hostname_local:
544
      raise errors.OpPrereqError("My own hostname (%s) does not match the"
545
                                 " resolver (%s): probably not using FQDN"
546
                                 " for hostname." %
547
                                 (hostname_local, hostname["hostname_full"]))
548

  
543 549
    self.clustername = clustername = utils.LookupHostname(self.op.cluster_name)
544 550
    if not clustername:
545 551
      raise errors.OpPrereqError("Cannot resolve given cluster name ('%s')"
......
1433 1439
                                 "Please fix and re-run this command." %
1434 1440
                                 new_node.secondary_ip)
1435 1441

  
1442
    success, msg = ssh.VerifyNodeHostname(node)
1443
    if not success:
1444
      raise errors.OpExecError("Node '%s' claims it has a different hostname"
1445
                               " than the one the resolver gives: %s.\n"
1446
                               "Please fix and re-run this command." %
1447
                               (node, msg))
1448

  
1436 1449
    # Distribute updated /etc/hosts and known_hosts to all nodes,
1437 1450
    # including the node just added
1438 1451
    myself = self.cfg.GetNodeInfo(self.sstore.GetMasterNode())

Also available in: Unified diff