# Sample Configurations

[ovs]
# Do not change this parameter unless you have a good reason to.
# This is the name of the OVS integration bridge. There is one per hypervisor.
# The integration bridge acts as a virtual "patch port". All VM VIFs are
# attached to this bridge and then "patched" according to their network
# connectivity.
# integration_bridge = br-int

[agent]
# Agent's polling interval in seconds
# polling_interval = 2

# Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
# root filter facility.
# Change to "sudo" to skip the filtering and just run the comand directly
root_helper = sudo

[securitygroup]
# Firewall driver for realizing neutron security group function
firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver

[ofc]
# Specify OpenFlow Controller Host, Port and Driver to connect.
# host = 127.0.0.1
# port = 8888

# Drivers are in neutron/plugins/nec/drivers/ .
# driver = trema

# PacketFilter is available when it's enabled in this configuration
# and supported by the driver.
# enable_packet_filter = true

# Use SSL to connect
# use_ssl = false

# Key file
# key_file =

# Certificate file
# cert_file =

[provider]
# Default router provider to use.
# default_router_provider = l3-agent
# List of enabled router providers.
# router_providers = l3-agent,openflow

# Sample Configurations

[ovs]
# Do not change this parameter unless you have a good reason to.
# This is the name of the OVS integration bridge. There is one per hypervisor.
# The integration bridge acts as a virtual "patch port". All VM VIFs are
# attached to this bridge and then "patched" according to their network
# connectivity.
# integration_bridge = br-int

[agent]
# Agent's polling interval in seconds
# polling_interval = 2

[securitygroup]
# Firewall driver for realizing neutron security group function
firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver

[ofc]
# Specify OpenFlow Controller Host, Port and Driver to connect.
# host = 127.0.0.1
# port = 8888

# Drivers are in neutron/plugins/nec/drivers/ .
# driver = trema

# PacketFilter is available when it's enabled in this configuration
# and supported by the driver.
# enable_packet_filter = true

# Use SSL to connect
# use_ssl = false

# Key file
# key_file =

# Certificate file
# cert_file =

[provider]
# Default router provider to use.
# default_router_provider = l3-agent
# List of enabled router providers.
# router_providers = l3-agent,openflow

Remove root_helper config from plugin ini
Remove root_helper config from plugin ini

As root_helper is defined in neutron.conf, root_helper in plugin ini
is unnecessary and brings confusion when configuring the parameter.
This patch updates plugin ini of NEC plugin and Brocade plugin.

Change-Id: I5b1c36d8d6ffc20ae0b4191a73aaa51f2b3d9a1b
Closes-Bug: #1259242
