Use beaker DSL to generate puppet cert

voxpupuli · Mar 29, 2015 · fca3c32 · fca3c32
1 parent e116896
commit fca3c32
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -26,6 +26,7 @@ def ldapsearch(cmd, exit_codes = [0,1], &block)
     puts 'Sorry, this osfamily is not supported.'
     exit
   end
+  on host, 'puppet cert generate $(facter fqdn)'
 end
 
 RSpec.configure do |c|
@@ -43,15 +44,6 @@ def ldapsearch(cmd, exit_codes = [0,1], &block)
     # Set up Certificates
     pp = <<-EOS
       $ssldir = '/var/lib/puppet/ssl'
-      Exec {
-        path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-      exec { "puppet cert generate ${::fqdn}":
-        creates => [
-          "${ssldir}/private_keys/${::fqdn}.pem",
-          "${ssldir}/certs/${::fqdn}.pem",
-        ],
-      }
       file { '/etc/ldap':
         ensure => directory,
       }
@@ -66,10 +58,8 @@ def ldapsearch(cmd, exit_codes = [0,1], &block)
         ->
         exec { "certtool -k < ${ssldir}/private_keys/${::fqdn}.pem > /etc/ldap/ssl/${::fqdn}.key":
           creates => "/etc/ldap/ssl/${::fqdn}.key",
-          require => [
-            File['/etc/ldap/ssl'],
-            Exec["puppet cert generate ${::fqdn}"],
-          ],
+          path    => $::path,
+          require => File['/etc/ldap/ssl'],
           before  => File["/etc/ldap/ssl/${::fqdn}.key"],
         }
       } else {