Revision 62c9ec92 lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
748 | 748 |
'node-net-test': [(node.name, node.primary_ip, node.secondary_ip) |
749 | 749 |
for node in nodeinfo] |
750 | 750 |
} |
751 |
all_nvinfo = rpc.call_node_verify(nodelist, node_verify_param) |
|
751 |
all_nvinfo = rpc.call_node_verify(nodelist, node_verify_param, |
|
752 |
self.cfg.GetClusterName()) |
|
752 | 753 |
all_rversion = rpc.call_version(nodelist) |
753 | 754 |
all_ninfo = rpc.call_node_info(nodelist, self.cfg.GetVGName()) |
754 | 755 |
|
... | ... | |
1777 | 1778 |
# TODO: do a node-net-test as well? |
1778 | 1779 |
} |
1779 | 1780 |
|
1780 |
result = rpc.call_node_verify(node_verify_list, node_verify_param) |
|
1781 |
result = rpc.call_node_verify(node_verify_list, node_verify_param, |
|
1782 |
self.cfg.GetClusterName()) |
|
1781 | 1783 |
for verifier in node_verify_list: |
1782 | 1784 |
if not result[verifier]: |
1783 | 1785 |
raise errors.OpExecError("Cannot communicate with %s's node daemon" |
... | ... | |
3581 | 3583 |
feedback_fn("* running the instance OS import scripts...") |
3582 | 3584 |
src_node = self.op.src_node |
3583 | 3585 |
src_image = self.src_image |
3586 |
cluster_name = self.cfg.GetClusterName() |
|
3584 | 3587 |
if not rpc.call_instance_os_import(pnode_name, iobj, "sda", "sdb", |
3585 |
src_node, src_image):
|
|
3588 |
src_node, src_image, cluster_name):
|
|
3586 | 3589 |
raise errors.OpExecError("Could not import os for instance" |
3587 | 3590 |
" %s on node %s" % |
3588 | 3591 |
(instance, pnode_name)) |
... | ... | |
4830 | 4833 |
|
4831 | 4834 |
# TODO: check for size |
4832 | 4835 |
|
4836 |
cluster_name = self.cfg.GetClusterName() |
|
4833 | 4837 |
for dev in snap_disks: |
4834 |
if not rpc.call_snapshot_export(src_node, dev, dst_node.name, instance): |
|
4838 |
if not rpc.call_snapshot_export(src_node, dev, dst_node.name, |
|
4839 |
instance, cluster_name): |
|
4835 | 4840 |
logger.Error("could not export block device %s from node %s to node %s" |
4836 | 4841 |
% (dev.logical_id[1], src_node, dst_node.name)) |
4837 | 4842 |
if not rpc.call_blockdev_remove(src_node, dev): |
Also available in: Unified diff