From 834cec00211d7da79f59e0bab5a7c7c7ece2529f Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <motoki@da.jp.nec.com>
Date: Tue, 10 Dec 2013 02:07:54 +0900
Subject: [PATCH] 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
---
 etc/neutron/plugins/brocade/brocade.ini | 4 ----
 etc/neutron/plugins/nec/nec.ini         | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/etc/neutron/plugins/brocade/brocade.ini b/etc/neutron/plugins/brocade/brocade.ini
index 9acd1d990..916e9e5d2 100644
--- a/etc/neutron/plugins/brocade/brocade.ini
+++ b/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>
 #
diff --git a/etc/neutron/plugins/nec/nec.ini b/etc/neutron/plugins/nec/nec.ini
index cc9d812bf..9cbdbe409 100644
--- a/etc/neutron/plugins/nec/nec.ini
+++ b/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
-- 
2.45.2