From ba5acf88a1f2f8f109e13f828369002899956f6e Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Tue, 6 Jun 2017 10:03:59 +0200 Subject: [PATCH] migrate: migration_type setting moved to pve-guest-common --- PVE/QemuMigrate.pm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index bf756a6b..22c0d7de 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -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); };