From 4b0f4a49d0401202388ca96afe652397b000ed21 Mon Sep 17 00:00:00 2001 From: Jens Rosenboom Date: Fri, 8 Apr 2016 17:04:05 +0200 Subject: [PATCH] Do not hardcode any DHCP options for Neutron With Mitaka, Neutron has learned to set proper MTU values for the DHCP agent depending on the encapsulation type being used. So do not override them any more from our side. Change-Id: Ib3c14a828374d607c49257682d552159c72a13f9 Closes-Bug: 1567923 --- attributes/default.rb | 5 ----- templates/default/dnsmasq.conf.erb | 1 - 2 files changed, 6 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 90975fbd..49da49c5 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -84,11 +84,6 @@ end # ============================= dnsmasq Configuration =================== # TODO: (jklare) this should be refactored and probably pull in the some dnsmasq # cookbook to do the proper configuration -# Override the default mtu setting given to virtual machines -# to 1454 to allow for tunnel and other encapsulation overhead. You -# can adjust this from 1454 to 1500 if you do not want any lowering -# of the default guest MTU. -default['openstack']['network']['dnsmasq']['dhcp-option'] = '26,1454' # the version of dnsmasq for centos 6.5 is two revs behind where the dhcp-agent needs # to run properly. This is a version that allows and starts the dhcp-agent correctly. default['openstack']['network']['dnsmasq']['rpm_version'] = '2.65-1.el6.rfx.x86_64' diff --git a/templates/default/dnsmasq.conf.erb b/templates/default/dnsmasq.conf.erb index 4da035c5..5b7c3030 100644 --- a/templates/default/dnsmasq.conf.erb +++ b/templates/default/dnsmasq.conf.erb @@ -1,4 +1,3 @@ -dhcp-option=<%= node['openstack']['network']['dnsmasq']['dhcp-option'] %> <% node['openstack']['network']['dnsmasq']['upstream_dns_servers'].each do |dns_server| -%> server=<%= dns_server %> <% end -%>