sync some configuration items with codes

Bug #1210173

Change-Id: I3622a45f0907e49391156322553665845978a551

diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini
index 51952e224b0d16fc515a76e8675f41dbe595ef3e..e38bae22b00bab3c83b8f58bfa7185930ae60658 100644 (file)
--- a/etc/dhcp_agent.ini
+++ b/etc/dhcp_agent.ini
@@ -1,26 +1,26 @@
 [DEFAULT]
 # Show debugging output in log (sets DEBUG log level output)
-# debug = true
+# debug = False
 
 # The DHCP agent will resync its state with Neutron to recover from any
 # transient notification or rpc errors. The interval is number of
 # seconds between attempts.
 # resync_interval = 5
 
-# The DHCP requires that an inteface driver be set.  Choose the one that best
-# matches you plugin.
-
+# The DHCP agent requires an interface driver be set. Choose the one that best
+# matches your plugin.
 # interface_driver =
 
-# Example interface_driver for OVS based plugins(OVS, Ryu, NEC, NVP,
+# Example of interface_driver option for OVS based plugins(OVS, Ryu, NEC, NVP,
 # BigSwitch/Floodlight)
 # interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 
-# OVS based plugins(Ryu, NEC, NVP, BigSwitch/Floodlight) that use OVS
-# as OpenFlow switch and check port status
-# ovs_use_veth = True
+# Use veth for an OVS interface or not.
+# Support kernels with limited namespace support
+# (e.g. RHEL 6.5) so long as ovs_use_veth is set to True.
+# ovs_use_veth = False
 
-# Example interface_driver for LinuxBridge
+# Example of interface_driver option for LinuxBridge
 # interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
 
 # The agent can use other DHCP drivers.  Dnsmasq is the simplest and requires

diff --git a/etc/l3_agent.ini b/etc/l3_agent.ini
index 94222da2815595147427883fc66e32c679dcf23a..77e5d15cb2279b8a307dd8a2171e3df71752e44d 100644 (file)
--- a/etc/l3_agent.ini
+++ b/etc/l3_agent.ini
@@ -1,18 +1,21 @@
 [DEFAULT]
 # Show debugging output in log (sets DEBUG log level output)
-# debug = True
+# debug = False
 
-# L3 requires that an interface driver be set.  Choose the one that best
+# L3 requires that an interface driver be set. Choose the one that best
 # matches your plugin.
+# interface_driver =
 
-# OVS based plugins (OVS, Ryu, NEC) that supports L3 agent
-interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
+# Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC)
+# that supports L3 agent
+# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 
-# OVS based plugins(Ryu, NEC) that use OVS
-# as OpenFlow switch and check port status
-# ovs_use_veth = True
+# Use veth for an OVS interface or not.
+# Support kernels with limited namespace support
+# (e.g. RHEL 6.5) so long as ovs_use_veth is set to True.
+# ovs_use_veth = False
 
-# LinuxBridge
+# Example of interface_driver option for LinuxBridge
 # interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
 
 # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and

diff --git a/etc/lbaas_agent.ini b/etc/lbaas_agent.ini
index c95e0be9de607d5bdbad097f3cdb57ff093bb549..17df74c3487a7eb493a2f7eefb0e5f5aa0a6a4c6 100644 (file)
--- a/etc/lbaas_agent.ini
+++ b/etc/lbaas_agent.ini
@@ -1,20 +1,26 @@
 [DEFAULT]
-# Show debugging output in log (sets DEBUG log level output)
-# debug = true
+# Show debugging output in log (sets DEBUG log level output).
+# debug = False
 
 # The LBaaS agent will resync its state with Neutron to recover from any
 # transient notification or rpc errors. The interval is number of
 # seconds between attempts.
 # periodic_interval = 10
 
-# OVS based plugins(OVS, Ryu, NEC, NVP, BigSwitch/Floodlight)
-interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
+# LBaas requires an interface driver be set. Choose the one that best
+# matches your plugin.
+# interface_driver =
 
-# OVS based plugins(Ryu, NEC, NVP, BigSwitch/Floodlight) that use OVS
-# as OpenFlow switch and check port status
-# ovs_use_veth = True
+# Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC, NVP,
+# BigSwitch/Floodlight)
+# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 
-# LinuxBridge
+# Use veth for an OVS interface or not.
+# Support kernels with limited namespace support
+# (e.g. RHEL 6.5) so long as ovs_use_veth is set to True.
+# ovs_use_veth = False
+
+# Example of interface_driver option for LinuxBridge
 # interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
 
 # The agent requires a driver to manage the loadbalancer.  HAProxy is the