Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-02-15 05:57:39 +03:00
Code Releases Activity

migrate: migration_type setting moved to pve-guest-common

Browse Source
This commit is contained in:
Wolfgang Bumiller 2017-06-06 10:03:59 +02:00 committed by Dietmar Maurer
parent 21463b9a04
commit ba5acf88a1
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/QemuMigrate.pm
View File

@ -436,20 +436,6 @@ sub phase1 {
$conf->{lock} = 'migrate';
PVE::QemuConfig->write_config($vmid, $conf);
# we use TCP only for unsecure migrations as TCP ssh forward tunnels often
# did appeared to late (they are hard, if not impossible, to check for)
# secure migration use UNIX sockets now, this *breaks* compatibilty when trying
# to migrate from new to old but *not* from old to new.
my $datacenterconf = PVE::Cluster::cfs_read_file('datacenter.cfg');
my $migration_type = 'secure';
if (defined($self->{opts}->{migration_type})) {
$migration_type = $self->{opts}->{migration_type};
} elsif (defined($datacenterconf->{migration}->{type})) {
$migration_type = $datacenterconf->{migration}->{type};
}
$self->{opts}->{migration_type} = $migration_type;
sync_disks($self, $vmid);
};