Revision d51ae04c lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
9143 | 9143 |
disk_info = [] |
9144 | 9144 |
for idx, disk_data in enumerate(self.op.target_node): |
9145 | 9145 |
try: |
9146 |
(host, port) = masterd.instance.CheckRemoteExportDiskInfo(cds, idx,
|
|
9147 |
disk_data)
|
|
9146 |
(host, port, magic) = \
|
|
9147 |
masterd.instance.CheckRemoteExportDiskInfo(cds, idx, disk_data)
|
|
9148 | 9148 |
except errors.GenericError, err: |
9149 | 9149 |
raise errors.OpPrereqError("Target info for disk %s: %s" % (idx, err), |
9150 | 9150 |
errors.ECODE_INVAL) |
9151 | 9151 |
|
9152 |
disk_info.append((host, port)) |
|
9152 |
disk_info.append((host, port, magic))
|
|
9153 | 9153 |
|
9154 | 9154 |
assert len(disk_info) == len(self.op.target_node) |
9155 | 9155 |
self.dest_disk_info = disk_info |
... | ... | |
9241 | 9241 |
OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM, |
9242 | 9242 |
self.dest_x509_ca) |
9243 | 9243 |
|
9244 |
opts = objects.ImportExportOptions(key_name=key_name, |
|
9245 |
ca_pem=dest_ca_pem) |
|
9246 |
|
|
9247 |
(fin_resu, dresults) = helper.RemoteExport(opts, self.dest_disk_info, |
|
9244 |
(fin_resu, dresults) = helper.RemoteExport(self.dest_disk_info, |
|
9245 |
key_name, dest_ca_pem, |
|
9248 | 9246 |
timeouts) |
9249 | 9247 |
finally: |
9250 | 9248 |
helper.Cleanup() |
Also available in: Unified diff