openstack
/
neutron
Code Issues Proposed changes

Merge "Add enable_security_group to BigSwitch and OneConvergence ini files"

This commit is contained in:
Jenkins 2014-03-25 20:03:21 +00:00 committed by Gerrit Code Review
parent 4599e80bd2 6537c3a5c6
commit 084679db44
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/neutron/plugins/bigswitch/restproxy.ini
View File

@ -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

4
etc/neutron/plugins/oneconvergence/nvsdplugin.ini
View File

@ -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