From 69778e35becb8eb2333f3e1fce9cb4c55c4b4e93 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 19 Feb 2014 16:50:25 +0100 Subject: [PATCH] network/dhcp: fix dnsmasq configuration I introduced a bug in the last patchset in the dnsmasq options. This patch aims to fix it. Close #270 Signed-off-by: Emilien Macchi --- spec/classes/cloud_network_dhcp_spec.rb | 2 +- templates/network/dnsmasq-neutron.conf.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/classes/cloud_network_dhcp_spec.rb b/spec/classes/cloud_network_dhcp_spec.rb index 813cee6c..274071c2 100644 --- a/spec/classes/cloud_network_dhcp_spec.rb +++ b/spec/classes/cloud_network_dhcp_spec.rb @@ -85,7 +85,7 @@ describe 'cloud::network::dhcp' do :owner => 'root', :group => 'root' ) - verify_contents(subject, '/etc/neutron/dnsmasq-neutron.conf', ["dhcp-options-force=26,1400"]) + verify_contents(subject, '/etc/neutron/dnsmasq-neutron.conf', ["dhcp-option-force=26,1400"]) end end diff --git a/templates/network/dnsmasq-neutron.conf.erb b/templates/network/dnsmasq-neutron.conf.erb index d18d9671..979bd1a1 100644 --- a/templates/network/dnsmasq-neutron.conf.erb +++ b/templates/network/dnsmasq-neutron.conf.erb @@ -1 +1 @@ -dhcp-options-force=26,<%= @veth_mtu %> +dhcp-option-force=26,<%= @veth_mtu %>