From: Akihiro Motoki <motoki@da.jp.nec.com>
Date: Sat, 22 Mar 2014 10:13:10 +0000 (+0900)
Subject: Add enable_security_group to BigSwitch and OneConvergence ini files
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6537c3a5c6632705f594e80d95437a31bd62edb1;p=openstack-build%2Fneutron-build.git

Add enable_security_group to BigSwitch and OneConvergence ini files

It is a follow up patch for https://review.openstack.org/#/c/67281/.

Change-Id: I38463b3879ab2d7469a85ef00426b2b602fa825a
Closes-Bug: #1296000
---

diff --git a/etc/neutron/plugins/bigswitch/restproxy.ini b/etc/neutron/plugins/bigswitch/restproxy.ini
index 389b0d3a1..755b7638e 100644
--- a/etc/neutron/plugins/bigswitch/restproxy.ini
+++ b/etc/neutron/plugins/bigswitch/restproxy.ini
@@ -102,3 +102,8 @@ servers=localhost:8080
 # Options: ovs or ivs
 # Default: ovs
 # virtual_switch_type = ovs
+
+[security_group]
+# Controls if neutron security group is enabled or not.
+# It should be false when you use nova security group.
+# enable_security_group = True
diff --git a/etc/neutron/plugins/oneconvergence/nvsdplugin.ini b/etc/neutron/plugins/oneconvergence/nvsdplugin.ini
index 50d9694e0..a1c05d971 100644
--- a/etc/neutron/plugins/oneconvergence/nvsdplugin.ini
+++ b/etc/neutron/plugins/oneconvergence/nvsdplugin.ini
@@ -24,6 +24,10 @@
 # then NoopFirewallDriver otherwise OVSHybridIptablesFirewallDriver.
 # firewall_driver = neutron.agent.firewall.NoopFirewallDriver
 
+# Controls if neutron security group is enabled or not.
+# It should be false when you use nova security group.
+# enable_security_group = True
+
 [agent]
 # root_helper = sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf