Revision 2f10179b lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
2414 | 2414 |
self.my_inst_info) |
2415 | 2415 |
|
2416 | 2416 |
feedback_fn("* Verifying configuration file consistency") |
2417 |
self._VerifyFiles(_ErrorIf, self.my_node_info.values(), master_node, |
|
2418 |
all_nvinfo, filemap) |
|
2417 |
|
|
2418 |
if master_node not in self.my_node_info: |
|
2419 |
# _VerifyFiles requires that master_node is present in the passed node |
|
2420 |
# info, to use it as a point of reference even if we're verifying only a |
|
2421 |
# subset of nodes. Make it so. |
|
2422 |
vf_nvinfo = all_nvinfo.copy() |
|
2423 |
vf_node_info = (self.my_node_info.values() + |
|
2424 |
[self.all_node_info[master_node]]) |
|
2425 |
|
|
2426 |
key = constants.NV_FILELIST |
|
2427 |
vf_nvinfo.update(self.rpc.call_node_verify([master_node], |
|
2428 |
{key: node_verify_param[key]}, |
|
2429 |
self.cfg.GetClusterName())) |
|
2430 |
else: |
|
2431 |
vf_nvinfo = all_nvinfo |
|
2432 |
vf_node_info = self.my_node_info.values() |
|
2433 |
|
|
2434 |
self._VerifyFiles(_ErrorIf, vf_node_info, master_node, vf_nvinfo, filemap) |
|
2419 | 2435 |
|
2420 | 2436 |
feedback_fn("* Verifying node status") |
2421 | 2437 |
|
Also available in: Unified diff