diff options
author | mh <mh@immerda.ch> | 2012-06-06 01:19:34 -0300 |
---|---|---|
committer | mh <mh@immerda.ch> | 2012-06-06 01:19:34 -0300 |
commit | 5f5482a2084029382a10058a287ff85c8c16c7ac (patch) | |
tree | 2e4c6f2fe63e525935133685b6341928ac3f7885 /manifests/rules/puppet.pp | |
parent | ce27d7cd097c0e2267be494b9988efe91b87165f (diff) |
fix for new style for 2.7
Diffstat (limited to 'manifests/rules/puppet.pp')
-rw-r--r-- | manifests/rules/puppet.pp | 21 |
1 files changed, 8 insertions, 13 deletions
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; } } |