From 7f1bf8e43a858cbb7a752a99f56376f771fcca5b Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 23 Dec 2014 13:26:07 -0800
Subject: [PATCH] More spec_helper_acceptance fixes

---
 spec/spec_helper_acceptance.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 813d1b1b..38444b85 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -37,7 +37,9 @@ def create_keys_for_test(host)
   else
     path = '${PATH}'
     path = "/opt/csw/bin:#{path}" # Need ruby's path on solaris 10 (foss)
-    path = "/opt/puppet/bin:#{path}" # But try PE's ruby first
+    if host.is_pe?
+      path = "#{host['puppetbindir']}:#{path}" # But try PE's ruby first
+    end
     cmd = "PATH=#{path} ruby -e"
     temp_dir = '/tmp/'
   end
@@ -113,7 +115,6 @@ def create_keys_for_test(host)
         on host, apply_manifest(exec_puppet)
         on host, puppet('module install cyberious-windows_java')
       else
-        on host, puppet('module install puppetlabs-java')
         on host, puppet('module', 'install', 'puppetlabs-java'), {:acceptable_exit_codes => [0, 1]}
       end
     end