diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-06-29 21:52:06 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-06-29 21:52:06 -0300 |
| commit | 433a0f6fb12ad88d161da921ef35a92a4a181caa (patch) | |
| tree | 40304dab1b0af74db0ab05999acce6c1a6128f2d /manifests | |
| parent | f8f7a0896b4649b95900088cc982c1ce5dedad74 (diff) | |
| download | puppet-puppet-433a0f6fb12ad88d161da921ef35a92a4a181caa.tar.gz puppet-puppet-433a0f6fb12ad88d161da921ef35a92a4a181caa.tar.bz2 | |
Managing /etc/puppet/puppet.conf also for spare masters
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/puppetd.pp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/manifests/puppetd.pp b/manifests/puppetd.pp index a822a55..c878ff4 100644 --- a/manifests/puppetd.pp +++ b/manifests/puppetd.pp @@ -31,16 +31,13 @@ class puppetd inherits puppet { } # default config file for puppet nodes - case $puppetmasterd_present { - true: { } - default: { - file { "/etc/puppet/puppet.conf": - ensure => file, - owner => puppet, - group => puppet, - mode => 0644, - content => template("puppet/puppet-node.conf.erb"), - } + if ($puppetmasterd_present != true) or ($main_master != true) { + file { "/etc/puppet/puppet.conf": + ensure => file, + owner => puppet, + group => puppet, + mode => 0644, + content => template("puppet/puppet-node.conf.erb"), } } |