we don't need to check $authfile, puppet will do the right thing

Conflicts:
	manifests/agent/generate_sshkey.pp

1 files changed, 5 insertions, 15 deletions

diff --git a/manifests/agent/config.pp b/manifests/agent/config.pp
index 934a05f..36f2910 100644
--- a/manifests/agent/config.pp
+++ b/manifests/agent/config.pp
@@ -37,21 +37,11 @@ class check_mk::agent::config (
     }
     'ssh'   : {
       if $generate_sshkey {
-        if $authfile {
-          # if authfile is overridden, pass it through
-          check_mk::agent::generate_sshkey { "check_mk_key_${::fqdn}":
-            keydir    => $keydir,
-            authdir   => $authdir,
-            authfile  => $authfile,
-            sshuser   => $sshuser
-          }
-        } else {
-          # otherwise don't
-          check_mk::agent::generate_sshkey { "check_mk_key_${::fqdn}":
-            keydir  => $keydir,
-            authdir => $authdir,
-            sshuser => $sshuser
-          }
+        check_mk::agent::generate_sshkey { "check_mk_key_${::fqdn}":
+          keydir   => $keydir,
+          authdir  => $authdir,
+          authfile => $authfile,
+          sshuser  => $sshuser
         }
       }