Revision 258de3fe
| b/lib/cmdlib/backup.py | ||
|---|---|---|
| 435 | 435 |
|
| 436 | 436 |
(fin_resu, dresults) = helper.RemoteExport(self.dest_disk_info, |
| 437 | 437 |
key_name, dest_ca_pem, |
| 438 |
self.op.compress, |
|
| 438 | 439 |
timeouts) |
| 439 | 440 |
finally: |
| 440 | 441 |
helper.Cleanup() |
| b/lib/masterd/instance.py | ||
|---|---|---|
| 1271 | 1271 |
|
| 1272 | 1272 |
return (fin_resu, dresults) |
| 1273 | 1273 |
|
| 1274 |
def RemoteExport(self, disk_info, key_name, dest_ca_pem, timeouts): |
|
| 1274 |
def RemoteExport(self, disk_info, key_name, dest_ca_pem, compress, timeouts):
|
|
| 1275 | 1275 |
"""Inter-cluster instance export. |
| 1276 | 1276 |
|
| 1277 | 1277 |
@type disk_info: list |
| ... | ... | |
| 1280 | 1280 |
@param key_name: Name of X509 key to use |
| 1281 | 1281 |
@type dest_ca_pem: string |
| 1282 | 1282 |
@param dest_ca_pem: Destination X509 CA in PEM format |
| 1283 |
@type compress: string |
|
| 1284 |
@param compress: one of L{constants.IEC_ALL}
|
|
| 1283 | 1285 |
@type timeouts: L{ImportExportTimeouts}
|
| 1284 | 1286 |
@param timeouts: Timeouts for this import |
| 1285 | 1287 |
|
| ... | ... | |
| 1299 | 1301 |
|
| 1300 | 1302 |
opts = objects.ImportExportOptions(key_name=key_name, |
| 1301 | 1303 |
ca_pem=dest_ca_pem, |
| 1302 |
magic=magic, ipv6=ipv6) |
|
| 1304 |
magic=magic, |
|
| 1305 |
compress=compress, |
|
| 1306 |
ipv6=ipv6) |
|
| 1303 | 1307 |
|
| 1304 | 1308 |
self._feedback_fn("Sending disk %s to %s:%s" % (idx, host, port))
|
| 1305 | 1309 |
finished_fn = compat.partial(self._TransferFinished, idx) |
Also available in: Unified diff