Revision 44caf5a8
b/lib/bootstrap.py | ||
---|---|---|
190 | 190 |
" belong to this host. Aborting." % |
191 | 191 |
hostname.ip, errors.ECODE_ENVIRON) |
192 | 192 |
|
193 |
clustername = utils.GetHostInfo(cluster_name)
|
|
193 |
clustername = utils.GetHostInfo(utils.HostInfo.NormalizeName(cluster_name))
|
|
194 | 194 |
|
195 | 195 |
if utils.TcpPing(clustername.ip, constants.DEFAULT_NODED_PORT, |
196 | 196 |
timeout=5): |
b/lib/cmdlib.py | ||
---|---|---|
2907 | 2907 |
HTYPE = constants.HTYPE_NODE |
2908 | 2908 |
_OP_REQP = ["node_name"] |
2909 | 2909 |
|
2910 |
def CheckArguments(self): |
|
2911 |
# validate/normalize the node name |
|
2912 |
self.op.node_name = utils.HostInfo.NormalizeName(self.op.node_name) |
|
2913 |
|
|
2910 | 2914 |
def BuildHooksEnv(self): |
2911 | 2915 |
"""Build hooks env. |
2912 | 2916 |
|
... | ... | |
5654 | 5658 |
# for tools |
5655 | 5659 |
if not hasattr(self.op, "name_check"): |
5656 | 5660 |
self.op.name_check = True |
5661 |
# validate/normalize the instance name |
|
5662 |
self.op.instance_name = utils.HostInfo.NormalizeName(self.op.instance_name) |
|
5657 | 5663 |
if self.op.ip_check and not self.op.name_check: |
5658 | 5664 |
# TODO: make the ip check more flexible and not depend on the name check |
5659 | 5665 |
raise errors.OpPrereqError("Cannot do ip checks without a name check", |
b/scripts/gnt-node | ||
---|---|---|
133 | 133 |
|
134 | 134 |
""" |
135 | 135 |
cl = GetClient() |
136 |
dns_data = utils.GetHostInfo(args[0])
|
|
136 |
dns_data = utils.GetHostInfo(utils.HostInfo.NormalizeName(args[0]))
|
|
137 | 137 |
node = dns_data.name |
138 | 138 |
readd = opts.readd |
139 | 139 |
|
Also available in: Unified diff