Revision b705c7a6 lib/bootstrap.py
b/lib/bootstrap.py | ||
---|---|---|
244 | 244 |
" entries: %s" % invalid_hvs, |
245 | 245 |
errors.ECODE_INVAL) |
246 | 246 |
|
247 |
hostname = netutils.GetHostInfo()
|
|
247 |
hostname = netutils.GetHostname()
|
|
248 | 248 |
|
249 | 249 |
if netutils.IP4Address.IsLoopback(hostname.ip): |
250 | 250 |
raise errors.OpPrereqError("This host's IP (%s) resolves to a loopback" |
... | ... | |
258 | 258 |
" belong to this host. Aborting." % |
259 | 259 |
hostname.ip, errors.ECODE_ENVIRON) |
260 | 260 |
|
261 |
clustername = \ |
|
262 |
netutils.GetHostInfo(netutils.HostInfo.NormalizeName(cluster_name)) |
|
261 |
clustername = netutils.GetHostname(name=cluster_name) |
|
263 | 262 |
|
264 | 263 |
if netutils.TcpPing(clustername.ip, constants.DEFAULT_NODED_PORT, |
265 | 264 |
timeout=5): |
... | ... | |
649 | 648 |
@return: list of (node, votes) |
650 | 649 |
|
651 | 650 |
""" |
652 |
myself = netutils.HostInfo().name
|
|
651 |
myself = netutils.Hostname.GetSysName()
|
|
653 | 652 |
try: |
654 | 653 |
node_list.remove(myself) |
655 | 654 |
except ValueError: |
Also available in: Unified diff