diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-24 15:16:28 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-24 15:16:28 -0200 |
commit | 45c99882a470b33edf4789e67aca610ecd3eeda7 (patch) | |
tree | f50960d84d8168c798f13ebe025afcd7daec10c6 /manifests/puppetmasterd.pp | |
parent | 9d03c74a5133ff24178eaa86a662ea1bb7fc2e5e (diff) | |
download | puppet-puppet-45c99882a470b33edf4789e67aca610ecd3eeda7.tar.gz puppet-puppet-45c99882a470b33edf4789e67aca610ecd3eeda7.tar.bz2 |
Adding puppet::master::update
Diffstat (limited to 'manifests/puppetmasterd.pp')
-rw-r--r-- | manifests/puppetmasterd.pp | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/manifests/puppetmasterd.pp b/manifests/puppetmasterd.pp index b0bd3e0..16a79dd 100644 --- a/manifests/puppetmasterd.pp +++ b/manifests/puppetmasterd.pp @@ -92,15 +92,6 @@ class puppetmasterd { require => User["puppet"], } - # cron rule to update puppet config repository every 5 minutes - cron { "puppet-update": - command => "/usr/local/sbin/update-puppet-conf.sh > /dev/null 2>&1", - user => puppet, - minute => "*/5", - ensure => present, - require => [ File["/usr/local/sbin/update-puppet-conf.sh"], User["puppet"] ], - } - # cron rule to restart puppetmaster before restarting the nodes cron { "puppetmaster-restart": command => "/etc/init.d/puppetmaster restart > /dev/null 2>&1", @@ -124,6 +115,9 @@ class puppetmasterd { }, require => File["/usr/local/sbin/puppetlast"], } + + # update config + include puppet::master::update # custom puppetlast command, thanks to immerda module: # http://git.puppet.immerda.ch/?p=module-puppet.git;a=summary @@ -138,15 +132,6 @@ class puppetmasterd { mode => 0700, } - # and the script to the cron-job above - file { "/usr/local/sbin/update-puppet-conf.sh": - source => "puppet://$server/modules/puppet/update-puppet-conf.sh", - owner => "puppet", - group => "puppet", - mode => 0755, - ensure => present, - } - # for storeconfigs include mysql::server |