summaryrefslogtreecommitdiff
path: root/openstack/usr/share/openstack/neutron/dhcp_agent.ini
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-05-19 15:00:52 +0000
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-05-20 14:09:40 +0000
commit8e6921b91ab6ac81325e898308d24c504ee54ea2 (patch)
tree0bd9c9e4a0ff0c30f21d7a9c4ff3cec7224e4f00 /openstack/usr/share/openstack/neutron/dhcp_agent.ini
parent2a12037c85bb2be69001d775ae779c6a415ae373 (diff)
downloaddefinitions-baserock/tiagogomes/os-kilo.tar.gz
Neutron: add back the custom configurationbaserock/tiagogomes/os-kilo
Add back the custom configuration for Neutron, this time adapted for the OpenStack Kilo release.
Diffstat (limited to 'openstack/usr/share/openstack/neutron/dhcp_agent.ini')
-rw-r--r--openstack/usr/share/openstack/neutron/dhcp_agent.ini6
1 files changed, 3 insertions, 3 deletions
diff --git a/openstack/usr/share/openstack/neutron/dhcp_agent.ini b/openstack/usr/share/openstack/neutron/dhcp_agent.ini
index a0adccaa..e0963e57 100644
--- a/openstack/usr/share/openstack/neutron/dhcp_agent.ini
+++ b/openstack/usr/share/openstack/neutron/dhcp_agent.ini
@@ -13,7 +13,7 @@
# Example of interface_driver option for OVS based plugins(OVS, Ryu, NEC, NVP,
# BigSwitch/Floodlight)
-# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
+interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
# Name of Open vSwitch bridge to use
# ovs_integration_bridge = br-int
@@ -28,7 +28,7 @@
# The agent can use other DHCP drivers. Dnsmasq is the simplest and requires
# 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
# iproute2 package that supports namespaces). This option is deprecated and
@@ -41,7 +41,7 @@
# specific host routes to the DHCP request. The metadata service will only
# be activated when the subnet does not contain any router port. The guest
# instance must be configured to request host routes via DHCP (Option 121).
-# enable_isolated_metadata = False
+enable_isolated_metadata = True
# Allows for serving metadata requests coming from a dedicated metadata
# access network whose cidr is 169.254.169.254/16 (or larger prefix), and