Revision 47130d50 lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
60 | 60 |
from ganeti import rpc |
61 | 61 |
from ganeti import runtime |
62 | 62 |
from ganeti import pathutils |
63 |
from ganeti import vcluster |
|
63 | 64 |
from ganeti.masterd import iallocator |
64 | 65 |
|
65 | 66 |
import ganeti.masterd.instance # pylint: disable=W0611 |
... | ... | |
2565 | 2566 |
if nresult.fail_msg or not nresult.payload: |
2566 | 2567 |
node_files = None |
2567 | 2568 |
else: |
2568 |
node_files = nresult.payload.get(constants.NV_FILELIST, None) |
|
2569 |
fingerprints = nresult.payload.get(constants.NV_FILELIST, None) |
|
2570 |
node_files = dict((vcluster.LocalizeVirtualPath(key), value) |
|
2571 |
for (key, value) in fingerprints.items()) |
|
2572 |
del fingerprints |
|
2569 | 2573 |
|
2570 | 2574 |
test = not (node_files and isinstance(node_files, dict)) |
2571 | 2575 |
errorif(test, constants.CV_ENODEFILECHECK, node.name, |
... | ... | |
3089 | 3093 |
|
3090 | 3094 |
node_verify_param = { |
3091 | 3095 |
constants.NV_FILELIST: |
3092 |
utils.UniqueSequence(filename |
|
3093 |
for files in filemap |
|
3094 |
for filename in files), |
|
3096 |
map(vcluster.MakeVirtualPath, |
|
3097 |
utils.UniqueSequence(filename |
|
3098 |
for files in filemap |
|
3099 |
for filename in files)), |
|
3095 | 3100 |
constants.NV_NODELIST: |
3096 | 3101 |
self._SelectSshCheckNodes(node_data_list, self.group_uuid, |
3097 | 3102 |
self.all_node_info.values()), |
Also available in: Unified diff