Revision 89e1fc26 lib/cmdlib.py
| b/lib/cmdlib.py | ||
|---|---|---|
| 85 | 85 |
" use 'gnt-cluster init' first.") |
| 86 | 86 |
if self.REQ_MASTER: |
| 87 | 87 |
master = sstore.GetMasterNode() |
| 88 |
if master != socket.gethostname():
|
|
| 88 |
if master != utils.HostInfo().name:
|
|
| 89 | 89 |
raise errors.OpPrereqError("Commands must be run on the master"
|
| 90 | 90 |
" node %s" % master) |
| 91 | 91 |
|
| ... | ... | |
| 558 | 558 |
if config.ConfigWriter.IsCluster(): |
| 559 | 559 |
raise errors.OpPrereqError("Cluster is already initialised")
|
| 560 | 560 |
|
| 561 |
hostname_local = socket.gethostname() |
|
| 562 |
self.hostname = hostname = utils.LookupHostname(hostname_local) |
|
| 563 |
if not hostname: |
|
| 564 |
raise errors.OpPrereqError("Cannot resolve my own hostname ('%s')" %
|
|
| 565 |
hostname_local) |
|
| 566 |
|
|
| 567 |
if hostname.name != hostname_local: |
|
| 568 |
raise errors.OpPrereqError("My own hostname (%s) does not match the"
|
|
| 569 |
" resolver (%s): probably not using FQDN" |
|
| 570 |
" for hostname." % |
|
| 571 |
(hostname_local, hostname.name)) |
|
| 561 |
self.hostname = hostname = utils.HostInfo() |
|
| 572 | 562 |
|
| 573 | 563 |
if hostname.ip.startswith("127."):
|
| 574 | 564 |
raise errors.OpPrereqError("This host's IP resolves to the private"
|
| 575 | 565 |
" range (%s). Please fix DNS or /etc/hosts." % |
| 576 | 566 |
(hostname.ip,)) |
| 577 | 567 |
|
| 578 |
self.clustername = clustername = utils.LookupHostname(self.op.cluster_name) |
|
| 579 |
if not clustername: |
|
| 580 |
raise errors.OpPrereqError("Cannot resolve given cluster name ('%s')"
|
|
| 581 |
% self.op.cluster_name) |
|
| 568 |
self.clustername = clustername = utils.HostInfo(self.op.cluster_name) |
|
| 582 | 569 |
|
| 583 | 570 |
result = utils.RunCmd(["fping", "-S127.0.0.1", "-q", hostname.ip]) |
| 584 | 571 |
if result.failed: |
| ... | ... | |
| 961 | 948 |
"""Verify that the passed name is a valid one. |
| 962 | 949 |
|
| 963 | 950 |
""" |
| 964 |
hostname = utils.LookupHostname(self.op.name) |
|
| 965 |
if not hostname: |
|
| 966 |
raise errors.OpPrereqError("Cannot resolve the new cluster name ('%s')" %
|
|
| 967 |
self.op.name) |
|
| 951 |
hostname = utils.HostInfo(self.op.name) |
|
| 968 | 952 |
|
| 969 | 953 |
new_name = hostname.name |
| 970 | 954 |
self.ip = new_ip = hostname.ip |
| ... | ... | |
| 1404 | 1388 |
node_name = self.op.node_name |
| 1405 | 1389 |
cfg = self.cfg |
| 1406 | 1390 |
|
| 1407 |
dns_data = utils.LookupHostname(node_name) |
|
| 1408 |
if not dns_data: |
|
| 1409 |
raise errors.OpPrereqError("Node %s is not resolvable" % node_name)
|
|
| 1391 |
dns_data = utils.HostInfo(node_name) |
|
| 1410 | 1392 |
|
| 1411 | 1393 |
node = dns_data.name |
| 1412 | 1394 |
primary_ip = self.op.primary_ip = dns_data.ip |
| ... | ... | |
| 1614 | 1596 |
This checks that we are not already the master. |
| 1615 | 1597 |
|
| 1616 | 1598 |
""" |
| 1617 |
self.new_master = socket.gethostname() |
|
| 1618 |
|
|
| 1599 |
self.new_master = utils.HostInfo().name |
|
| 1619 | 1600 |
self.old_master = self.sstore.GetMasterNode() |
| 1620 | 1601 |
|
| 1621 | 1602 |
if self.old_master == self.new_master: |
| ... | ... | |
| 1716 | 1697 |
""" |
| 1717 | 1698 |
filename = self.op.filename |
| 1718 | 1699 |
|
| 1719 |
myname = socket.gethostname()
|
|
| 1700 |
myname = utils.HostInfo().name
|
|
| 1720 | 1701 |
|
| 1721 | 1702 |
for node in self.nodes: |
| 1722 | 1703 |
if node == myname: |
| ... | ... | |
| 2152 | 2133 |
self.instance = instance |
| 2153 | 2134 |
|
| 2154 | 2135 |
# new name verification |
| 2155 |
hostname1 = utils.LookupHostname(self.op.new_name) |
|
| 2156 |
if not hostname1: |
|
| 2157 |
raise errors.OpPrereqError("New instance name '%s' not found in dns" %
|
|
| 2158 |
self.op.new_name) |
|
| 2136 |
name_info = utils.HostInfo(self.op.new_name) |
|
| 2159 | 2137 |
|
| 2160 |
self.op.new_name = new_name = hostname1.name
|
|
| 2138 |
self.op.new_name = new_name = name_info.name
|
|
| 2161 | 2139 |
if not getattr(self.op, "ignore_ip", False): |
| 2162 |
command = ["fping", "-q", hostname1.ip]
|
|
| 2140 |
command = ["fping", "-q", name_info.ip]
|
|
| 2163 | 2141 |
result = utils.RunCmd(command) |
| 2164 | 2142 |
if not result.failed: |
| 2165 | 2143 |
raise errors.OpPrereqError("IP %s of instance %s already in use" %
|
| 2166 |
(hostname1.ip, new_name))
|
|
| 2144 |
(name_info.ip, new_name))
|
|
| 2167 | 2145 |
|
| 2168 | 2146 |
|
| 2169 | 2147 |
def Exec(self, feedback_fn): |
| ... | ... | |
| 2839 | 2817 |
" primary node" % self.op.os_type) |
| 2840 | 2818 |
|
| 2841 | 2819 |
# instance verification |
| 2842 |
hostname1 = utils.LookupHostname(self.op.instance_name) |
|
| 2843 |
if not hostname1: |
|
| 2844 |
raise errors.OpPrereqError("Instance name '%s' not found in dns" %
|
|
| 2845 |
self.op.instance_name) |
|
| 2820 |
hostname1 = utils.HostInfo(self.op.instance_name) |
|
| 2846 | 2821 |
|
| 2847 | 2822 |
self.op.instance_name = instance_name = hostname1.name |
| 2848 | 2823 |
instance_list = self.cfg.GetInstanceList() |
Also available in: Unified diff