From cf68d4248826b26b048a4271f87d7afbef215274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= Date: Thu, 3 Jul 2014 18:58:29 -0400 Subject: [PATCH] Undeprecate enable_security_group parameter Introduced by commit f87e7d964c19cc2be33226df66f0c823af993d49 in Neutron 2014.1.rc1, this config is far from deprecated. Restore it with proper default value. Conflicts: manifests/plugins/ml2.pp Change-Id: If74658dbdb0fc1961a664df7484ebc2d1b0a118b (cherry picked from commit 5b3abcff91f6d9ec152761848727501ac288d62f) --- manifests/plugins/ml2.pp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp index 4ccb1be93..3ae4ebbcc 100644 --- a/manifests/plugins/ml2.pp +++ b/manifests/plugins/ml2.pp @@ -83,6 +83,11 @@ # Min value is 0 and Max value is 16777215. # Default to empty. # +# [*enable_security_group*] +# (optional) Controls if neutron security group is enabled or not. +# It should be false when you use nova security group. +# Defaults to true. +# class neutron::plugins::ml2 ( $type_drivers = ['local', 'flat', 'vlan', 'gre', 'vxlan'], @@ -93,8 +98,8 @@ $tunnel_id_ranges = ['20:100'], $vxlan_group = '224.0.0.1', $vni_ranges = ['10:100'], + $enable_security_group = true, # DEPRECATED PARAMS - $enable_security_group = undef, $firewall_driver = undef ) { @@ -163,10 +168,6 @@ } } - if $enable_security_group { - warning('enable_security_group is deprecated. Security is managed by the firewall_drive value in ::neutron::agents::ml2::ovs.') - } - if $firewall_driver { warning('firewall_driver value is set in ::neutron::agents::ml2::ovs, argument ignored.') }