openstack
/
cookbook-openstack-network
Code Issues Proposed changes

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
This commit is contained in:
Jens Rosenboom 2016-04-08 17:04:05 +02:00
parent 820c8eebdb
commit 4b0f4a49d0
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
attributes/default.rb
View File

@ -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'

1
templates/default/dnsmasq.conf.erb
View File

@ -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 -%>