summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-06-17 12:42:09 +0000
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-06-17 14:43:04 +0000
commit5e78bb70d43d4adf214aa0519987033adfb5a92a (patch)
tree42b22479a227f54069bb54690803a143f92f1b98
parentc8296a8d4262b72fdc531ca257192d3a1f935908 (diff)
downloaddefinitions-5e78bb70d43d4adf214aa0519987033adfb5a92a.tar.gz
OpenStack: configure dnsmasq to provide a MTU
This is recommended in the OpenStack install guide if GRE tunnels are being used for inter VM traffic [1]. Without lowering the MTU from the typical 1500 bytes, I was unable to SSH into the VMs launched by Nova at least on my testing environment. [1]: http://docs.openstack.org/kilo/install-guide/install/apt/content/neutron-network-node.html Change-Id: I4e05144a4e9709e800e38a9008ff2295bfc5e2f6
-rw-r--r--install-files/openstack/etc/neutron/dnsmasq-neutron.conf2
-rw-r--r--install-files/openstack/manifest2
-rw-r--r--install-files/openstack/usr/share/openstack/neutron/dhcp_agent.ini2
3 files changed, 5 insertions, 1 deletions
diff --git a/install-files/openstack/etc/neutron/dnsmasq-neutron.conf b/install-files/openstack/etc/neutron/dnsmasq-neutron.conf
new file mode 100644
index 00000000..d2659481
--- /dev/null
+++ b/install-files/openstack/etc/neutron/dnsmasq-neutron.conf
@@ -0,0 +1,2 @@
+# Provide a MTU (DHCP MTU option 26)
+dhcp-option-force=26,1454
diff --git a/install-files/openstack/manifest b/install-files/openstack/manifest
index 8a5b47c1..3d9ea2dd 100644
--- a/install-files/openstack/manifest
+++ b/install-files/openstack/manifest
@@ -1,3 +1,5 @@
+0040755 0 0 /etc/neutron
+0100644 0 0 /etc/neutron/dnsmasq-neutron.conf
0040755 0 0 /etc/horizon
0100644 0 0 /etc/horizon/apache-horizon.conf
template 0100644 0 0 /etc/tempest/tempest.conf
diff --git a/install-files/openstack/usr/share/openstack/neutron/dhcp_agent.ini b/install-files/openstack/usr/share/openstack/neutron/dhcp_agent.ini
index e0963e57..1ab4c806 100644
--- a/install-files/openstack/usr/share/openstack/neutron/dhcp_agent.ini
+++ b/install-files/openstack/usr/share/openstack/neutron/dhcp_agent.ini
@@ -62,7 +62,7 @@ enable_isolated_metadata = True
# dhcp_domain = openstacklocal
# Override the default dnsmasq settings with this file
-# dnsmasq_config_file =
+dnsmasq_config_file = /etc/neutron/dnsmasq-neutron.conf
# Comma-separated list of DNS servers which will be used by dnsmasq
# as forwarders.