diff options
| author | mh <mh@immerda.ch> | 2012-06-17 16:45:07 -0300 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-06-17 16:45:07 -0300 |
| commit | 7fc91e98d779795fdf4c1c167ab6fc56028a7009 (patch) | |
| tree | 11c78a05ac3089e017c1a61f49e11b0422bc6d66 | |
| parent | e59aec0fadd435cff42dceeb147d4eb85fdc9484 (diff) | |
correct param naming
| -rw-r--r-- | manifests/cron.pp | 24 | ||||
| -rw-r--r-- | manifests/init.pp | 12 |
2 files changed, 18 insertions, 18 deletions
diff --git a/manifests/cron.pp b/manifests/cron.pp index ffb8032..c7bc782 100644 --- a/manifests/cron.pp +++ b/manifests/cron.pp @@ -7,20 +7,20 @@ class puppet::cron( $ensure_version = 'installed', $ensure_facter_version = 'installed', $manage_shorewall = false, - $puppetmaster = "puppet.${domain}", - $puppetmaster_port = '8140', - $puppetmaster_signport = '8141' + $shorewall_puppetmaster = "puppet.${domain}", + $shorewall_puppetmaster_port = '8140', + $shorewall_puppetmaster_signport = '8141' ) { class{'puppet': - config => $config, - http_compression => $http_compression, - cleanup_clientbucket => $cleanup_clientbucket, - ensure_version => $ensure_version, - ensure_facter_version => $ensure_facter_version, - manage_shorewall => $manage_shorewall, - puppetmaster => $puppetmaster, - puppetmaster_port => $puppetmaster_port, - puppetmaster_signport => $puppetmaster_signport, + config => $config, + http_compression => $http_compression, + 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, } case $::operatingsystem { debian: { include puppet::cron::debian } diff --git a/manifests/init.pp b/manifests/init.pp index 407ace1..ceb0c46 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -25,9 +25,9 @@ class puppet( $ensure_version = 'installed', $ensure_facter_version = 'installed', $manage_shorewall = false, - $puppetmaster = "puppet.${::domain}", - $puppetserver_port = 8140, - $puppetserver_signport = 8141 + $shorewall_puppetmaster = "puppet.${::domain}", + $shorewall_puppetmaster_port = 8140, + $shorewall_puppetmaster_signport = 8141 ){ case $::kernel { linux: { @@ -44,9 +44,9 @@ class puppet( if $manage_shorewall { class{'shorewall::rules::out::puppet': - puppetserver => $puppetserver, - puppetserver_port => $puppetserver_port, - puppetserver_signport => $puppetserver_signport, + puppetserver => $shorewall_puppetmaster, + puppetserver_port => $shorewall_puppetmaster_port, + puppetserver_signport => $shorewall_puppetmaster_signport, } } } |