Revision a3a5f850 lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
1370 | 1370 |
"tcp communication with node '%s': %s", |
1371 | 1371 |
anode, nresult[constants.NV_NODENETTEST][anode]) |
1372 | 1372 |
|
1373 |
test = constants.NV_MASTERIP not in nresult |
|
1374 |
_ErrorIf(test, self.ENODENET, node, |
|
1375 |
"node hasn't returned node master IP reachability data") |
|
1376 |
if not test: |
|
1377 |
if not nresult[constants.NV_MASTERIP]: |
|
1378 |
if node == self.master_node: |
|
1379 |
msg = "the master node cannot reach the master IP (not configured?)" |
|
1380 |
else: |
|
1381 |
msg = "cannot reach the master IP" |
|
1382 |
_ErrorIf(True, self.ENODENET, node, msg) |
|
1383 |
|
|
1384 |
|
|
1373 | 1385 |
def _VerifyInstance(self, instance, instanceconfig, node_image): |
1374 | 1386 |
"""Verify an instance. |
1375 | 1387 |
|
... | ... | |
1704 | 1716 |
# FIXME: verify OS list |
1705 | 1717 |
# do local checksums |
1706 | 1718 |
master_files = [constants.CLUSTER_CONF_FILE] |
1719 |
master_node = self.master_node = self.cfg.GetMasterNode() |
|
1720 |
master_ip = self.cfg.GetMasterIP() |
|
1707 | 1721 |
|
1708 | 1722 |
file_names = ssconf.SimpleStore().GetFileList() |
1709 | 1723 |
file_names.extend(constants.ALL_CERT_FILES) |
... | ... | |
1727 | 1741 |
constants.NV_HVINFO: self.cfg.GetHypervisorType(), |
1728 | 1742 |
constants.NV_NODESETUP: None, |
1729 | 1743 |
constants.NV_TIME: None, |
1744 |
constants.NV_MASTERIP: (master_node, master_ip), |
|
1730 | 1745 |
} |
1731 | 1746 |
|
1732 | 1747 |
if vg_name is not None: |
... | ... | |
1773 | 1788 |
self.cfg.GetClusterName()) |
1774 | 1789 |
nvinfo_endtime = time.time() |
1775 | 1790 |
|
1776 |
master_node = self.cfg.GetMasterNode() |
|
1777 | 1791 |
all_drbd_map = self.cfg.ComputeDRBDMap() |
1778 | 1792 |
|
1779 | 1793 |
feedback_fn("* Verifying node status") |
Also available in: Unified diff