[pve-devel] [PATCH cluster 2/2] datacenter.cfg: remove deprecated migration_unsecure property

Thomas Lamprecht t.lamprecht at proxmox.com
Fri Dec 1 13:25:13 CET 2017


The datacenter configuration property 'migration_unsecure' has been
depreacted shortly after 4.3 release by commit
bba12ad728de5d2a13a7cfd3a0cf345a4a235b9a
All who want to upgrade must cycle through 4.4 thus they got their
config already transformed to the new migration property.

So remove the transform to new code and also its definition int the
datacenter schema

Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
---
 data/PVE/Cluster.pm | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/data/PVE/Cluster.pm b/data/PVE/Cluster.pm
index df2758f..8776275 100644
--- a/data/PVE/Cluster.pm
+++ b/data/PVE/Cluster.pm
@@ -1351,13 +1351,6 @@ my $datacenter_schema = {
 	    description => "Specify external http proxy which is used for downloads (example: 'http://username:password\@host:port/')",
 	    pattern => "http://.*",
 	},
-	migration_unsecure => {
-	    optional => 1,
-	    type => 'boolean',
-	    description => "Migration is secure using SSH tunnel by default. " .
-	      "For secure private networks you can disable it to speed up " .
-	      "migration. Deprecated, use the 'migration' property instead!",
-	},
 	migration => {
 	    optional => 1,
 	    type => 'string', format => $migration_format,
@@ -1429,12 +1422,6 @@ sub parse_datacenter_config {
 sub write_datacenter_config {
     my ($filename, $cfg) = @_;
 
-    # map deprecated setting to new one
-    if (defined($cfg->{migration_unsecure}) && !defined($cfg->{migration})) {
-	my $migration_unsecure = delete $cfg->{migration_unsecure};
-	$cfg->{migration}->{type} = ($migration_unsecure) ? 'insecure' : 'secure';
-    }
-
     if (my $migration = $cfg->{migration}) {
 	$cfg->{migration} = PVE::JSONSchema::print_property_string($migration, $migration_format);
     }
-- 
2.11.0





More information about the pve-devel mailing list