Merge "Remove root_helper config from plugin ini"

etc/neutron/plugins/brocade/brocade.ini

@@ -22,10 +22,6 @@
 # Example:
 # network_vlan_ranges = physnet1:1000:2999
 
-[agent]
-# Example:
-# root_helper = sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
-
 [linux_bridge]
 # physical_interface_mappings = <physical network name>:<local interface>
 #

etc/neutron/plugins/nec/nec.ini

@@ -12,11 +12,6 @@
 # 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