Raise start limit burst for dnsmasq

When we provision nodes, we can
restart dnsmasq to frequently
this leads to systemd not starting
dnsmasq again, thus we have dnsmasq
stopped and deployment failing.

Raise limit to 100 starts in 10 seconds
and also sync cobbler on netboot disable

Partial-bug: #1667006

Change-Id: Id14bb2bb162f0a9fc6e0a9a102d98f4f2a6dcf1a
This commit is contained in:
Vladimir Kuklin 2017-03-05 20:10:18 +03:00 committed by Aleksandr Didenko
parent a646ae6a13
commit 6b3d03b167
4 changed files with 19 additions and 2 deletions

View File

@ -63,7 +63,9 @@ Fuel::Systemd {
service_manage => false,
}
fuel::systemd { ['httpd', 'cobblerd', 'dnsmasq', 'xinetd'] :}
fuel::systemd { ['httpd', 'cobblerd', 'xinetd'] :}
fuel::systemd { 'dnsmasq': template_path => 'fuel/systemd/dnsmasq_template.erb' }
fuel::dnsmasq::dhcp_range {'default':
dhcp_start_address => $admin_network['dhcp_pool_start'],

View File

@ -0,0 +1,5 @@
[Service]
Restart=on-failure
RestartSec=5
StartLimitIntervalSec=10
StartLimitBurst=100

View File

@ -17,3 +17,4 @@ fi
test -z ${node_name} && echo 'Node name not found' && exit 1
cobbler system edit --name=${node_name} --netboot-enabled=${flag}
cobbler sync

View File

@ -39,7 +39,7 @@ describe manifest do
it { is_expected.to contain_file '/etc/resolv.conf' }
%w(httpd cobblerd dnsmasq xinetd).each do |service|
%w(httpd cobblerd xinetd).each do |service|
it "should containt '#{service}' fuel::systemd service with correct parameters" do
parameters = {
:start => true,
@ -50,6 +50,15 @@ describe manifest do
end
end
it "should containt dnsmasq fuel::systemd service with correct parameters" do
parameters = {
:start => true,
:template_path => 'fuel/systemd/dnsmasq_template.erb',
:config_name => 'restart.conf',
}
is_expected.to contain_fuel__systemd('dnsmasq').with parameters
end
it 'should declare the "fuel::dnsmasq::dhcp_range" with "default" title and correct parameters' do
parameters = {
:dhcp_start_address => fuel_settings['ADMIN_NETWORK']['dhcp_pool_start'],