From 5f5482a2084029382a10058a287ff85c8c16c7ac Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 6 Jun 2012 01:19:34 -0300
Subject: fix for new style for 2.7

---
 manifests/rules/puppet.pp | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'manifests/rules/puppet.pp')

diff --git a/manifests/rules/puppet.pp b/manifests/rules/puppet.pp
index b53c726..c6fc09b 100644
--- a/manifests/rules/puppet.pp
+++ b/manifests/rules/puppet.pp
@@ -1,16 +1,11 @@
-class shorewall::rules::puppet {
-  case $shorewall_puppetserver {
-    '': { $shorewall_puppetserver = "puppet.${domain}" } 
-  }
-  case $shorewall_puppetserver_port {
-    '': { $shorewall_puppetserver_port = '8140' }
-  }
-  case $shorewall_puppetserver_signport {
-    '': { $shorewall_puppetserver_signport = '8141' }
-  }
+class shorewall::rules::puppet(
+  $puppetserver = hiera('shorewall_puppetserver',"puppet.${domain}"),
+  $puppetserver_port = hiera('shorewall_puppetserver_port',8140) ,
+  $puppetserver_signport = hiera('shorewall_puppetserver_signport',8141) ,
+) {
   shorewall::params{
-        'PUPPETSERVER':             value => $shorewall_puppetserver;
-        'PUPPETSERVER_PORT':        value => $shorewall_puppetserver_port;
-        'PUPPETSERVER_SIGN_PORT':   value => $shorewall_puppetserver_signport;
+        'PUPPETSERVER':             value => $puppetserver;
+        'PUPPETSERVER_PORT':        value => $puppetserver_port;
+        'PUPPETSERVER_SIGN_PORT':   value => $puppetserver_signport;
   }
 }
-- 
cgit v1.2.3