Moved gem installation to init where it should have been.

voxpupuli · Jan 30, 2016 · 67133ae · 67133ae
1 parent 1097136
commit 67133ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -102,6 +102,13 @@
   $middleware_ssl_cert_path = "${ssldir}/middleware_cert.pem"
   $middleware_ssl_ca_path   = "${ssldir}/middleware_ca.pem"
 
+  if $securityprovider == 'sshkey' {
+    package{'sshkeyauth':
+      ensure   =>  'present',
+      provider =>  'puppet_gem',
+    }
+  }
+
   if $sshkey_server_learn_public_keys {
     $sshkey_server_publickey_dir_real = pick($sshkey_server_publickey_dir,"${confdir}/sshkey_pubkeys")
   }

diff --git a/manifests/server/config/securityprovider/sshkey.pp b/manifests/server/config/securityprovider/sshkey.pp
@@ -4,11 +4,6 @@
     fail("Use of private class ${name} by ${caller_module_name}")
   }
 
-  ensure_packages('sshkeyauth', {
-    'ensure'   =>  'present',
-    'provider' =>  'puppet_gem', }
-  )
-
   if $mcollective::sshkey_server_learn_public_keys {
     # In the event the node is both a server and a client and they share a public key directory
     ensure_resource('file', $mcollective::sshkey_server_publickey_dir_real, {