[pve-devel] [PATCH 1/2] PVE::API2::Qemu: pass ssh cipher option on migrate
Stefan Priebe
s.priebe at profihost.ag
Tue Oct 30 15:44:26 CET 2012
From: Stefan Priebe <git at profihost.ag>
Signed-off-by: root <root at neuerserver.de-nserver.de.de-nserver.de>
---
PVE/API2/Qemu.pm | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 8c4c323..ce1f6c5 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -4,7 +4,7 @@ use strict;
use warnings;
use Cwd 'abs_path';
-use PVE::Cluster qw (cfs_read_file cfs_write_file);;
+use PVE::Cluster qw (cfs_read_file cfs_write_file);
use PVE::SafeSyslog;
use PVE::Tools qw(extract_param);
use PVE::Exception qw(raise raise_param_exc);
@@ -1729,10 +1729,14 @@ __PACKAGE__->register_method({
} else {
+ my $datacenterconf = PVE::Cluster::cfs_read_file('datacenter.cfg');
+ my $ssh_opts = {};
+ $ssh_opts->{cipher} = $datacenterconf->{cipher} if ( $datacenterconf->{cipher} );
+
my $realcmd = sub {
my $upid = shift;
- PVE::QemuMigrate->migrate($target, $targetip, $vmid, $param);
+ PVE::QemuMigrate->migrate($target, $targetip, $vmid, $param, $ssh_opts);
};
return $rpcenv->fork_worker('qmigrate', $vmid, $authuser, $realcmd);
--
1.7.2.5
More information about the pve-devel
mailing list