Skip to content

patch: make cronjob time dependent on IP address #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

patch: make cronjob time dependent on IP address #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c46ee31
patch: make cronjob time dependent on IP address
Jan 27, 2017
219277e
strict_variables mode is stupid
Jan 27, 2017
f5d125b
strict_variables mode is still stupid
Jan 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 36 additions & 2 deletions manifests/agent.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,21 +200,55 @@
$service_enable = false

# Default to every 30 minutes - random around the clock
if $cron_minute == undef {
if $cron_minute == undef or $cron_minute == 'random' {
$time1 = fqdn_rand(30)
$time2 = $time1 + 30
$minute = [ $time1, $time2 ]
}
elsif $cron_minute =~ /^ip(?::(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}))?(?:\/(\d+))?(?:%(\d+))?$/ {
# Determine the minute to run puppet based on this hosts' IP address
# with fine-grained control based on optionally provided IP, mask and modulo.
# Defaults:
# node ip (based on fact),
# ignore most-significatnt 24 bits,
# modulo 60.
# Thus, if this node's IP is 10.2.7.63, mask is 24, mod is 60,
# minute <- 3
# If IP is 10.2.9.63, mask is 16, mod is 300, then
# minute <- 267

# Test cases (TODO)
# cron_minute = 'ip' # node's ip , mask 24, mod 60
# cron_minute = 'ip%180' # node's ip, mask 24, mod 180
# cron_minute = 'ip/22' # node's ip, mask 22,mod 60
# cron_minute = 'ip/16%600' # node's ip, mask 16,mod 600
# cron_minute = 'ip:130.10.21.2'
# cron_minute = 'ip:130.10.21.2/24'
# cron_minute = 'ip:130.10.21.2/16%300' # mod 300
# cron_minute = 'ip:%{::ip_address}/22'

$cron_minute_ip = pick($1,getvar('::ipaddress'),"127.0.0.1")
$cron_minute_mask = pick($2,24)
$cron_minute_mod = pick($3,60)
$minute = inline_template('<%=
require "ipaddr";
a=@cron_minute_ip; b=@cron_minute_mask.to_i;c=@cron_minute_mod.to_i
# Convert ip address to int, then mask by inverted subnet mask, then mod
((IPAddr.new(a).to_i & ~(0xFFFFFFFF << (32-b))) % c)
%>')
}
else {
$minute = $cron_minute
}

cron { 'puppet-client':
cron { 'puppet-agent':
command => $puppet_run_command,
user => 'root',
hour => $cron_hour,
minute => $minute,
}
cron { 'puppet-client': ensure => 'absent', } # Why did someone name this "client"?

}
# Run Puppet through external tooling, like MCollective
'external': {
Expand Down
39 changes: 38 additions & 1 deletion spec/acceptance/agent_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,47 @@ class { 'puppet::agent':
describe cron do
# Note: This only has four *'s since the minute part is randomized
# by the agent module.
it { should have_entry "* * * * \/usr\/bin\/puppet agent --no-daemonize --onetime --logdest syslog > \/dev\/null 2>&1" }
it { should have_entry "% * * * \/usr\/bin\/puppet agent --no-daemonize --onetime --logdest syslog > \/dev\/null 2>&1" }
end
end

context 'agent run from cron-with-ip1' do
it 'should work with no errors' do
pp = <<-EOS
class { 'puppet::agent':
puppet_run_style => 'cron',
cron_minute = 'ip:10.2.3.44/8%60', # (2*256*256+3*256+44)%60 = 24
}
EOS

apply_manifest(pp, :catch_failures => true)
end

describe cron do
it { should have_entry "22 * * * \/usr\/bin\/puppet agent --no-daemonize --onetime --logdest syslog > \/dev\/null 2>&1" }
end
end

context 'agent run from cron-with-ip2' do
it 'should work with no errors' do
pp = <<-EOS
class { 'puppet::agent':
puppet_run_style => 'cron',
cron_minute = 'ip:10.2.3.44/16%300', # .. (3*256+44)%300 = 212
}
EOS

apply_manifest(pp, :catch_failures => true)
end

describe cron do
it { should have_entry "122 * * * \/usr\/bin\/puppet agent --no-daemonize --onetime --logdest syslog > \/dev\/null 2>&1" }
end
end




context 'agent run style manual' do
it 'should work with no errors' do
pp = <<-EOS
Expand Down
74 changes: 72 additions & 2 deletions spec/classes/puppet_agent_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,84 @@
:enable => false,
:require => "Package[#{params[:puppet_agent_package]}]"
)
should contain_cron('puppet-client').with(
should contain_cron('puppet-agent').with(
:command => '/usr/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1',
:user => 'root',
:hour => '5',
:minute => '*/30'
)
}
end
context 'using cron-with-ip1' do
let(:params) do
{
:puppet_server => 'test.exaple.com',
:puppet_agent_service => 'puppet',
:puppet_agent_package => 'puppet',
:version => '/etc/puppet/manifests/site.pp',
:puppet_run_style => 'cron',
:splay => 'true',
:environment => 'production',
:puppet_server_port => 8140,
:cron_minute => 'ip:10.2.3.44/8%60', # (2*256*256+3*256+44)%60 = 4
}
end
it{
should contain_cron('puppet-agent').with(
:command => '/usr/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1',
:user => 'root',
:hour => '*',
:minute => '4'
)
}
end
context 'using cron-with-ip2' do
let(:params) do
{
:puppet_server => 'test.exaple.com',
:puppet_agent_service => 'puppet',
:puppet_agent_package => 'puppet',
:version => '/etc/puppet/manifests/site.pp',
:puppet_run_style => 'cron',
:splay => 'true',
:environment => 'production',
:puppet_server_port => 8140,
:cron_minute => 'ip:10.2.3.44/16%300', # .. (3*256+44)%300 = 212
}
end
it{
should contain_cron('puppet-agent').with(
:command => '/usr/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1',
:user => 'root',
:hour => '*',
:minute => '212'
)
}
end
context 'using cron-with-ip3' do
let(:params) do
{
:puppet_server => 'test.exaple.com',
:puppet_agent_service => 'puppet',
:puppet_agent_package => 'puppet',
:version => '/etc/puppet/manifests/site.pp',
:puppet_run_style => 'cron',
:splay => 'true',
:environment => 'production',
:puppet_server_port => 8140,
:cron_minute => 'ip/0', # .. (127*256*256+1)%60 = 53
}
end
it{
should contain_cron('puppet-agent').with(
:command => '/usr/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1',
:user => 'root',
:hour => '*',
:minute => '53'
)
}
end

end

describe 'srv records on Debian' do
Expand Down Expand Up @@ -230,7 +300,7 @@
:enable => false,
:require => "Package[#{params[:puppet_agent_package]}]"
)
should contain_cron('puppet-client').with(
should contain_cron('puppet-agent').with(
:command => '/usr/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1',
:user => 'root',
:hour => '*'
Expand Down