[pve-devel] applied: [PATCH cluster v2] add migration format to datacenter config

[Dietmar Maurer]

applied, comments inline:

>  
> +my $migration_format = {
> +    type => {
> +	default_key => 1,
> +	type => 'string',
> +	enum => ['secure', 'insecure'],
> +	description => "Migration traffic is encrypted using an SSH tunnel by " .
> +	  "default. On secure, completely private networks this can be " .
> +	  "disabled to increase performance.",
> +	default => 'secure',
> +	format_description => 'migration type',

I removed that format_description, so that the man pages shows all
available options.


>  sub write_datacenter_config {
>      my ($filename, $cfg) = @_;
> -    
> +
> +    # map deprecated setting to new one
> +    if (defined($cfg->{migration_unsecure})) {
> +	my $migration_unsecure = delete $cfg->{migration_unsecure};

I changed that:

-    if (defined($cfg->{migration_unsecure})) {
+    if (defined($cfg->{migration_unsecure}) && !defined($cfg->{migration})) {
 

> +	$cfg->{migration}->{type} = ($migration_unsecure) ? 'insecure' : 'secure';
> +    }
> +
>      return PVE::JSONSchema::dump_config($datacenter_schema, $filename, $cfg);
>  }
>