diff options
| author | mh <mh@immerda.ch> | 2012-06-18 14:56:59 -0300 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-06-18 14:56:59 -0300 |
| commit | 31f7bbcae199de9d35daaa7c2d47aac5d0567e65 (patch) | |
| tree | 932811464008b66e1237c56af06c6abf44c833ec /manifests | |
| parent | 1abec7ab73695e5c2e6a091f9355bcc04d25fa3b (diff) | |
cleanup param mes
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/cron.pp | 4 | ||||
| -rw-r--r-- | manifests/init.pp | 5 | ||||
| -rw-r--r-- | manifests/master.pp | 14 |
3 files changed, 9 insertions, 14 deletions
diff --git a/manifests/cron.pp b/manifests/cron.pp index c7bc782..b4d9140 100644 --- a/manifests/cron.pp +++ b/manifests/cron.pp @@ -6,8 +6,7 @@ class puppet::cron( $cleanup_clientbucket = false, $ensure_version = 'installed', $ensure_facter_version = 'installed', - $manage_shorewall = false, - $shorewall_puppetmaster = "puppet.${domain}", + $shorewall_puppetmaster = false, $shorewall_puppetmaster_port = '8140', $shorewall_puppetmaster_signport = '8141' ) { @@ -17,7 +16,6 @@ class puppet::cron( cleanup_clientbucket => $cleanup_clientbucket, ensure_version => $ensure_version, ensure_facter_version => $ensure_facter_version, - manage_shorewall => $manage_shorewall, shorewall_puppetmaster => $shorewall_puppetmaster, shorewall_puppetmaster_port => $shorewall_puppetmaster_port, shorewall_puppetmaster_signport => $shorewall_puppetmaster_signport, diff --git a/manifests/init.pp b/manifests/init.pp index ceb0c46..3a71ed0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -24,8 +24,7 @@ class puppet( $cleanup_clientbucket = false, $ensure_version = 'installed', $ensure_facter_version = 'installed', - $manage_shorewall = false, - $shorewall_puppetmaster = "puppet.${::domain}", + $shorewall_puppetmaster = false, $shorewall_puppetmaster_port = 8140, $shorewall_puppetmaster_signport = 8141 ){ @@ -42,7 +41,7 @@ class puppet( default: { include puppet::base } } - if $manage_shorewall { + if $shorewall_puppetmaster { class{'shorewall::rules::out::puppet': puppetserver => $shorewall_puppetmaster, puppetserver_port => $shorewall_puppetmaster_port, diff --git a/manifests/master.pp b/manifests/master.pp index 1a463c7..55ab1e5 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -14,10 +14,10 @@ class puppet::master( $mode = 'webrick', $cleanup_reports = '30', $reports_dir = '/var/lib/puppet/reports', - $manage_shorewall = false, $shorewall_puppetmaster = "domain.${::domain}", $shorewall_puppetmaster_port = 8140, - $shorewall_puppetmaster_signport = 8141 + $shorewall_puppetmaster_signport = 8141, + $manage_munin = false ) { if $cron_time { class{'puppet::cron': @@ -27,7 +27,6 @@ class puppet::master( cron_time => $cron_time, ensure_version => $ensure_version, ensure_facter_version => $ensure_facter_version, - manage_shorewall => $manage_shorewall, shorewall_puppetmaster => $shorewall_puppetmaster, shorewall_puppetmaster_port => $shorewall_puppetmaster_port, shorewall_puppetmaster_signport => $shorewall_puppetmaster_signport, @@ -39,7 +38,6 @@ class puppet::master( cleanup_clientbucket => $cleanup_clientbucket, ensure_version => $ensure_version, ensure_facter_version => $ensure_facter_version, - manage_shorewall => $manage_shorewall, } } case $::operatingsystem { @@ -73,11 +71,11 @@ class puppet::master( include puppet::master::cleanup_reports::disable } - if $manage_shorewall { + if $shorewall_puppetmaster { class{'shorewall::rules::puppet::master': - puppetserver => $puppetserver, - puppetserver_port => $puppetserver_port, - puppetserver_signport => $puppetserver_signport, + puppetserver => $shorewall_puppetmaster, + puppetserver_port => $shorewall_puppetmaster_port, + puppetserver_signport => $shorewall_puppetmaster_signport, } } |