diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-02-01 15:44:46 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-02-01 15:44:46 -0200 |
| commit | ceacbb9189f865f2ef22894942636e7e78724840 (patch) | |
| tree | 7bac4f3f4de2f81f7cb5d5af2f6407d5efc73728 | |
| parent | bbd1c3ddd44e428f510a5c4d0073d281ea944880 (diff) | |
| download | puppet-puppet-ceacbb9189f865f2ef22894942636e7e78724840.tar.gz puppet-puppet-ceacbb9189f865f2ef22894942636e7e78724840.tar.bz2 | |
Rollback and cleanup
| -rw-r--r-- | manifests/daemon.pp | 22 | ||||
| -rw-r--r-- | manifests/master.pp | 5 |
2 files changed, 13 insertions, 14 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp index 1102398..8c6e583 100644 --- a/manifests/daemon.pp +++ b/manifests/daemon.pp @@ -1,7 +1,6 @@ # handles puppetd service class puppet::daemon( $master = false, - $main_master = false, $ensure = hiera('puppet::daemon::ensure', ''), $port = hiera('puppet::daemon::port', "8140"), $runinterval = hiera('puppet::daemon::runinterval', "7200"), @@ -51,19 +50,14 @@ class puppet::daemon( $agent_name = 'agent' } - # Default config file for puppet nodes - if ($master != true) or ($main_master != true) { - file { "/etc/puppet/puppet.conf": - ensure => file, - owner => puppet, - group => puppet, - content => template("puppet/puppet-node.conf.erb"), - } - } else { - file { "/etc/puppet/puppet.conf": - ensure => file, - owner => puppet, - group => puppet, + # Puppet config file + file { "/etc/puppet/puppet.conf": + ensure => file, + owner => puppet, + group => puppet, + content => $master ? { + true => undef, # the content is in the git repo + default => template("puppet/puppet-node.conf.erb"), } } diff --git a/manifests/master.pp b/manifests/master.pp index 2d34b91..8ea4928 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -19,6 +19,11 @@ class puppet::master( include puppet::master::ca } + # then include the daemon + class { 'puppet::daemon': + master => true, + } + # needed packages package { "sqlite3": ensure => installed; |