From 5b3abcff91f6d9ec152761848727501ac288d62f 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. Change-Id: If74658dbdb0fc1961a664df7484ebc2d1b0a118b --- manifests/plugins/ml2.pp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp index afbde79fe..cfa65f83d 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,7 @@ $tunnel_id_ranges = ['20:100'], $vxlan_group = '224.0.0.1', $vni_ranges = ['10:100'], - # DEPRECATED PARAMS - $enable_security_group = undef + $enable_security_group = true ) { include neutron::params