diff options
| author | Matt Taggart <taggart@riseup.net> | 2015-01-22 12:11:04 -0800 |
|---|---|---|
| committer | Matt Taggart <taggart@riseup.net> | 2015-04-16 21:14:53 +0000 |
| commit | ef821fad2dda052fd60255e7c6e3a199d536fa69 (patch) | |
| tree | 4411c331ff451955582e9221fdfe4011f08c91ba /manifests/agent.pp | |
| parent | 3736a2b0a2b33bc00231d7222a65ae33af5a43c9 (diff) | |
we don't need to check $authfile, puppet will do the right thing
Conflicts:
manifests/agent/generate_sshkey.pp
Diffstat (limited to 'manifests/agent.pp')
| -rw-r--r-- | manifests/agent.pp | 44 |
1 files changed, 13 insertions, 31 deletions
diff --git a/manifests/agent.pp b/manifests/agent.pp index e34a293..c455bd5 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -44,37 +44,19 @@ class check_mk::agent ( method => $method } - if $authfile { - # if authfile is set, pass it though - class { 'check_mk::agent::config': - ip_whitelist => $ip_whitelist, - port => $port, - server_dir => $server_dir, - keydir => $keydir, - authdir => $authdir, - authfile => $authfile, - use_cache => $use_cache, - user => $user, - method => $method, - generate_sshkey => $generate_sshkey, - sshuser => $sshuser, - require => Class['check_mk::agent::install'], - } - } else { - # otherwise don't - class { 'check_mk::agent::config': - ip_whitelist => $ip_whitelist, - port => $port, - server_dir => $server_dir, - keydir => $keydir, - authdir => $authdir, - use_cache => $use_cache, - user => $user, - method => $method, - generate_sshkey => $generate_sshkey, - sshuser => $sshuser, - require => Class['check_mk::agent::install'], - } + class { 'check_mk::agent::config': + ip_whitelist => $ip_whitelist, + port => $port, + server_dir => $server_dir, + keydir => $keydir, + authdir => $authdir, + authfile => $authfile, + use_cache => $use_cache, + user => $user, + method => $method, + generate_sshkey => $generate_sshkey, + sshuser => $sshuser, + require => Class['check_mk::agent::install'], } if ( $register_agent ) { |