]> git.proxmox.com Git - qemu-server.git/commitdiff
migrate: migration_type setting moved to pve-guest-common
authorWolfgang Bumiller <w.bumiller@proxmox.com>
Tue, 6 Jun 2017 08:03:59 +0000 (10:03 +0200)
committerDietmar Maurer <dietmar@proxmox.com>
Fri, 9 Jun 2017 10:28:28 +0000 (12:28 +0200)
PVE/QemuMigrate.pm

index bf756a6be29afb5ad13a9874999b100a7d3971bd..22c0d7dee8cf6f1264adc518cdcafb054467171f 100644 (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);
 
 };