openstack/neutron-fwaas
Code Issues Proposed changes

Sync dhcp agent configuration items

Browse Source 
Implements: Bug #1205180

Change-Id: Ic5089087fb6dd7d71740556ab8d3d4d6b82920d1
This commit is contained in:
Yong Sheng Gong 2013-07-26 12:01:08 +08:00
parent 7218ed2d58
commit f11dbbe748
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
etc/dhcp_agent.ini
View File

@ -10,17 +10,22 @@
# The DHCP requires that an inteface driver be set. Choose the one that best # The DHCP requires that an inteface driver be set. Choose the one that best
# matches you plugin. # matches you plugin.
# OVS based plugins(OVS, Ryu, NEC, NVP, BigSwitch/Floodlight) # interface_driver =
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
# Example interface_driver 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 # OVS based plugins(Ryu, NEC, NVP, BigSwitch/Floodlight) that use OVS
# as OpenFlow switch and check port status # as OpenFlow switch and check port status
#ovs_use_veth = True # ovs_use_veth = True
# LinuxBridge
#interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver # Example interface_driver for LinuxBridge
# 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
# no additional setup of the DHCP server. # no additional setup of the DHCP server.
dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq # dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
# 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
# iproute2 package that supports namespaces). # iproute2 package that supports namespaces).
@ -44,3 +49,18 @@ dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
# Number of threads to use during sync process. Should not exceed connection # Number of threads to use during sync process. Should not exceed connection
# pool size configured on server. # pool size configured on server.
# num_sync_threads = 4 # num_sync_threads = 4
# Location to store DHCP server config files
# dhcp_confs = $state_path/dhcp
# Domain to use for building the hostnames
# dhcp_domain = openstacklocal
# Override the default dnsmasq settings with this file
# dnsmasq_config_file =
# Use another DNS server before any in /etc/resolv.conf.
# dnsmasq_dns_server =
# Location to DHCP lease relay UNIX domain socket
# dhcp_lease_relay_socket = $state_path/dhcp/lease_relay