From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 30 Jun 2010 00:52:06 +0000 (-0300)
Subject: Managing /etc/puppet/puppet.conf also for spare masters
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=433a0f6fb12ad88d161da921ef35a92a4a181caa;p=puppet-puppet.git

Managing /etc/puppet/puppet.conf also for spare masters
---

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"),
     }
   }