sync some configuration items with codes

Bug #1210173

Change-Id: I3622a45f0907e49391156322553665845978a551
This commit is contained in:
Yong Sheng Gong 2013-08-08 23:15:31 +08:00
parent 1d94f1bfee
commit c04eb3ae69
3 changed files with 34 additions and 25 deletions

View File

@ -1,26 +1,26 @@
[DEFAULT] [DEFAULT]
# Show debugging output in log (sets DEBUG log level output) # 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 # The DHCP agent will resync its state with Neutron to recover from any
# transient notification or rpc errors. The interval is number of # transient notification or rpc errors. The interval is number of
# seconds between attempts. # seconds between attempts.
# resync_interval = 5 # resync_interval = 5
# The DHCP requires that an inteface driver be set. Choose the one that best # The DHCP agent requires an interface driver be set. Choose the one that best
# matches you plugin. # matches your plugin.
# interface_driver = # 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) # BigSwitch/Floodlight)
# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver # interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
# OVS based plugins(Ryu, NEC, NVP, BigSwitch/Floodlight) that use OVS # Use veth for an OVS interface or not.
# as OpenFlow switch and check port status # Support kernels with limited namespace support
# ovs_use_veth = True # (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 # interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
# The agent can use other DHCP drivers. Dnsmasq is the simplest and requires # The agent can use other DHCP drivers. Dnsmasq is the simplest and requires

View File

@ -1,18 +1,21 @@
[DEFAULT] [DEFAULT]
# Show debugging output in log (sets DEBUG log level output) # 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. # matches your plugin.
# interface_driver =
# OVS based plugins (OVS, Ryu, NEC) that supports L3 agent # Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC)
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver # that supports L3 agent
# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
# OVS based plugins(Ryu, NEC) that use OVS # Use veth for an OVS interface or not.
# as OpenFlow switch and check port status # Support kernels with limited namespace support
# ovs_use_veth = True # (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 # interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
# Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and

View File

@ -1,20 +1,26 @@
[DEFAULT] [DEFAULT]
# Show debugging output in log (sets DEBUG log level output) # Show debugging output in log (sets DEBUG log level output).
# debug = true # debug = False
# The LBaaS agent will resync its state with Neutron to recover from any # The LBaaS agent will resync its state with Neutron to recover from any
# transient notification or rpc errors. The interval is number of # transient notification or rpc errors. The interval is number of
# seconds between attempts. # seconds between attempts.
# periodic_interval = 10 # periodic_interval = 10
# OVS based plugins(OVS, Ryu, NEC, NVP, BigSwitch/Floodlight) # LBaas requires an interface driver be set. Choose the one that best
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver # matches your plugin.
# interface_driver =
# OVS based plugins(Ryu, NEC, NVP, BigSwitch/Floodlight) that use OVS # Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC, NVP,
# as OpenFlow switch and check port status # BigSwitch/Floodlight)
# ovs_use_veth = True # 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 # interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
# The agent requires a driver to manage the loadbalancer. HAProxy is the # The agent requires a driver to manage the loadbalancer. HAProxy is the