Stop configuring neutron to enforce DHCP MTU option
Since Mitaka, Neutron does the right job to calculate and advertise correct MTU to instances, out of the box. Change-Id: I71a6dc5b56c2c1fb9db757df77a56feababdc039
This commit is contained in:
parent
7a5f10471f
commit
fcec77b246
|
@ -1,2 +0,0 @@
|
|||
dhcp-option-force=26,1454
|
||||
|
|
@ -62,7 +62,6 @@ 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.
|
||||
|
|
|
@ -62,7 +62,6 @@ 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.
|
||||
|
|
|
@ -66,10 +66,6 @@
|
|||
template: src=dhcp_agent.ini dest=/etc/neutron/dhcp_agent.ini
|
||||
backup=yes
|
||||
|
||||
- name: update dnsmasq-neutron.conf
|
||||
template: src=templates/dnsmasq-neutron.conf
|
||||
dest=/etc/neutron/dnsmasq-neutron.conf
|
||||
|
||||
- name: config metadata agent
|
||||
template: src=metadata_agent.ini
|
||||
dest=/etc/neutron/metadata_agent.ini backup=yes
|
||||
|
@ -86,13 +82,6 @@
|
|||
template: src=templates/neutron.conf
|
||||
dest=/etc/neutron/neutron.conf backup=yes
|
||||
|
||||
- name: force mtu to 1450 for vxlan
|
||||
lineinfile:
|
||||
dest: /etc/neutron/dnsmasq-neutron.conf
|
||||
regexp: '^dhcp-option-force'
|
||||
line: 'dhcp-option-force=26,1450'
|
||||
when: "'vxlan' in {{ NEUTRON_TUNNEL_TYPES }}"
|
||||
|
||||
- include: firewall.yml
|
||||
when: enable_fwaas == True
|
||||
|
||||
|
|
|
@ -62,7 +62,6 @@ 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.
|
||||
|
|
|
@ -62,7 +62,6 @@ 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.
|
||||
|
|
|
@ -228,12 +228,6 @@ default['openstack']['network']['nova']['send_events_interval'] = 2
|
|||
# The scheduler class to use for scheduling to DHCP agents
|
||||
default['openstack']['network']['dhcp']['scheduler'] = 'neutron.scheduler.dhcp_agent_scheduler.ChanceScheduler'
|
||||
|
||||
# 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']['dhcp']['dhcp-option'] = '26,1454'
|
||||
|
||||
# Number of seconds between sync of DHCP agent with Neutron API server
|
||||
default['openstack']['network']['dhcp']['resync_interval'] = 5
|
||||
|
||||
|
|
|
@ -116,10 +116,6 @@ describe 'openstack-network::dhcp_agent' do
|
|||
)
|
||||
end
|
||||
|
||||
it 'overrides dhcp options' do
|
||||
expect(chef_run).to render_file(file.name).with_content('dhcp-option=26,1454')
|
||||
end
|
||||
|
||||
it 'checks upstream resolvers' do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^server=209.244.0.3$/)
|
||||
expect(chef_run).to render_file(file.name).with_content(/^server=8.8.8.8$/)
|
||||
|
|
Loading…
Reference in New Issue