diff options
| -rw-r--r-- | modules/puppet/manifests/client.pp | 23 | ||||
| -rw-r--r-- | modules/puppet/manifests/init.pp | 24 |
2 files changed, 24 insertions, 23 deletions
diff --git a/modules/puppet/manifests/client.pp b/modules/puppet/manifests/client.pp new file mode 100644 index 00000000..6f344165 --- /dev/null +++ b/modules/puppet/manifests/client.pp @@ -0,0 +1,23 @@ +class puppet::client { + package { puppet: } + + file { "/etc/puppet/puppet.conf": + content => template("puppet/puppet.conf"), + require => Package[puppet] + } + + cron { "puppet": + command => "/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog > /dev/null 2>&1", + user => "root", + minute => fqdn_rand( 60 ), + ensure => present, + } + + # we are using cron, so no need for the service + service { puppet: + enable => false, + hasstatus => true, + } +} + + diff --git a/modules/puppet/manifests/init.pp b/modules/puppet/manifests/init.pp index 94aa7009..c2e26794 100644 --- a/modules/puppet/manifests/init.pp +++ b/modules/puppet/manifests/init.pp @@ -1,27 +1,5 @@ - class puppet { - class client { - package { puppet: } - - file { "/etc/puppet/puppet.conf": - content => template("puppet/puppet.conf"), - require => Package[puppet] - } - - cron { "puppet": - command => "/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog > /dev/null 2>&1", - user => "root", - minute => fqdn_rand( 60 ), - ensure => present, - } - - service { puppet: - enable => false, - hasstatus => true, - } - } - - class master { + class master { include puppet::client # rails and sqlite3 are used for stored config |