@@ -2,3 +2,4 @@ 0 * * * * root /bin/ps ax | /bin/grep -v grep | /bin/grep -q puppetd || (sleep `echo $RANDOM/2000*60 | bc` && /etc/init.d/puppet restart) # restart puppet once in a while and randomly delay the restart between 0 and 32 minutes -> splay puppetmaster hammering 0 22 * * */2 root sleep `echo $RANDOM/1000*60 | bc` && /etc/init.d/puppet restart > /dev/null + files/cron.d/puppetd @@ -2,3 +2,4 @@ 0 * * * * root /etc/init.d/puppet status > /dev/null || (sleep `echo $RANDOM/2000*60 | bc` && /etc/init.d/puppet restart) # restart puppet once in a while and randomly delay the restart between 0 and 32 minutes -> splay puppetmaster hammering 0 22 * * */2 root sleep `echo $RANDOM/1000*60 | bc` && /etc/init.d/puppet restart > /dev/null + files/cron.d/puppetd.CentOS @@ -2,3 +2,4 @@ # 0 * * * * root /bin/ps ax | /bin/grep -v grep | /bin/grep -q puppetd || ( sleep `echo $RANDOM/2000*60 | bc` && /etc/init.d/puppet restart ) # restart puppet once in a while and randomly delay the restart between 0 and 32 minutes -> splay puppetmaster hammering # 0 22 * * */2 root sleep `echo $RANDOM/1000*60 | bc` && /etc/init.d/puppet restart > /dev/null + files/cron.d/puppetd.Gentoo @@ -1,2 +1,3 @@ # we restart puppetmaster every 4 hours to avoid memory problems 0 */6 * * * root /etc/init.d/puppetmaster restart > /dev/null + files/cron.d/puppetmaster @@ -1,2 +1,3 @@ # we restart puppetmaster every 4 hours to avoid memory problems -0 */6 * * * root /etc/init.d/puppetmaster restart > /dev/null +0 */4 * * * root /etc/init.d/puppetmaster restart > /dev/null + files/cron.d/puppetmaster.CentOS @@ -3,6 +3,9 @@ # modules/puppet/manifests/init.pp - manage puppet stuff # original by luke kanies # http://github.com/lak +# adapted by puzzle itc +# merged with immerda project group's +# solution # # Copyright 2008, admin(at)immerda.ch # Copyright 2008, Puzzle ITC GmbH @@ -19,16 +22,21 @@ class puppet { case $kernel { - linux: { case $operatingsystem { - gentoo: { include puppet::gentoo } - centos: { include puppet::centos } - debian: { include puppet::debian } - default: { include puppet::linux} - } + linux: { + case $operatingsystem { + gentoo: { include puppet::gentoo } + centos: { include puppet::centos } + debian: { include puppet::debian } + default: { include puppet::linux} + } } - openbsd: { include puppet::openbsd} + openbsd: { include puppet::openbsd } + default: { include puppet::base } } +} + +class puppet::base { $real_puppet_config = $puppet_config ? { '' => "/etc/puppet/puppet.conf", default => $puppet_config, @@ -44,25 +52,28 @@ class puppet { notify => Service[puppet], owner => root, group => 0, mode => 600; } + service{'puppet': + ensure => running, + enable => true, + hasstatus => true, + hasrestart => true, + pattern => puppetd, + } + } -class puppet::linux { +class puppet::linux inherits puppet::base { package{ [ 'puppet', 'facter' ]: ensure => present, } # package bc needed for cron include bc - - service{'puppet': - ensure => running, - enable => true, - hasstatus => true, - hasrestart => true, - pattern => puppetd, + Service['puppet']{ require => Package[puppet], } + file{'/etc/cron.d/puppetd.cron': source => [ "puppet://$server/puppet/cron.d/puppetd.${operatingsystem}", "puppet://$server/puppet/cron.d/puppetd" ], @@ -93,6 +104,9 @@ class puppet::debian inherits puppet::linux { Service[puppet]{ hasstatus => false, } + File['/etc/cron.d/puppetd.cron']{ + path => '/etc/cron.d/puppetd', + } } class puppet::centos inherits puppet::linux { @@ -105,10 +119,26 @@ class puppet::centos inherits puppet::linux { owner => root, group => 0, mode => 0644; } } -class puppet::openbsd { - service{'puppet': - provider => base, - pattern => puppetd, - ensure => running, +class puppet::openbsd inherits puppet::base { + Service['puppet']{ + restart => '/bin/kill -HUP `/bin/cat /var/run/puppet/puppetd.pid`', + stop => '/bin/kill `/bin/cat /var/run/puppet/puppetd.pid`', + start => '/usr/local/bin/puppetd', + hasstatus => false, + hasrestart => false, + } + openbsd::add_to_rc_local{'puppetd': + binary => '/usr/local/bin/puppetd', + } + cron { 'puppetd_check': + command => '/bin/ps ax | /usr/bin/grep -v grep | /usr/bin/grep -q puppetd || (sleep `echo $RANDOM/2000*60 | bc` && /usr/local/bin/puppetd)', + user => root, + minute => 0, } + cron { 'puppetd_restart': + command => 'sleep `echo $RANDOM/2000*60 | bc` && /bin/kill `/bin/cat /var/run/puppet/puppetd.pid`; /usr/local/bin/puppetd', + minute => 0, + hour => 22, + monthday => '*/2', + } } manifests/init.pp @@ -12,6 +12,10 @@ class puppet::puppetmaster inherits puppet { } } } + include puppet::puppetmaster::base +} + +class puppet::puppetmaster::base inherits puppet::base { File[puppet_config]{ source => [ "puppet://$server/files/puppet/master/puppet.conf", @@ -44,6 +48,7 @@ class puppet::puppetmaster inherits puppet { } } + define puppet::puppetmaster::hasdb( $dbtype = 'mysql', $dbname = 'puppet', manifests/puppetmaster.pp @@ -1,11 +1,7 @@ # manifests/puppetmaster/cluster.pp class puppet::puppetmaster::cluster inherits puppet::puppetmaster { - include mongrel, nginx - - File[puppet_config] { - require +> [ Package[mongrel], Package[nginx], File[nginx_config] ], - } + include puppet::puppetmaster::cluster::base case $operatingsystem { gentoo, centos: { @@ -16,3 +12,11 @@ class puppet::puppetmaster::cluster inherits puppet::puppetmaster { } } } + +class puppet::puppetmaster::cluster::base inherits puppet::puppetmaster::base { + include mongrel, nginx + + File[puppet_config] { + require +> [ Package[mongrel], Package[nginx], File[nginx_config] ], + } +} manifests/puppetmaster/cluster.pp 7c3b123c815be28c71f1a8dd14d2b7e478807e7b 45afa4134bc07ec1eb32d0d20a3990055f4eb499 Marcel Haerry haerry@puzzle.ch http://github.com/puzzle/puppet-puppet/commit/841eb14d7da2eb42b4ed000fd0ea9bae5c9f7e2c 841eb14d7da2eb42b4ed000fd0ea9bae5c9f7e2c 2008-11-04T08:43:09-08:00 2008-11-04T08:43:09-08:00 merged with immerda 3711f25506c6ca77d90767e74f6e932b5bcbc17c Marcel Haerry haerry@puzzle.ch