From 33b90b4fbc165061722477bce956cf0eeb1f9761 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 14 May 2014 16:10:03 -0400
Subject: [PATCH] Fixes to get tests running on trusty.

---
 .../nodesets/ubuntu-server-1404-x64.yml          | 11 +++++++++++
 spec/spec_helper_acceptance.rb                   | 16 +++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 spec/acceptance/nodesets/ubuntu-server-1404-x64.yml

diff --git a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
new file mode 100644
index 0000000..cba1cd0
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  ubuntu-server-1404-x64:
+    roles:
+      - master
+    platform: ubuntu-14.04-amd64
+    box : puppetlabs/ubuntu-14.04-64-nocm
+    box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
+    hypervisor : vagrant
+CONFIG:
+  log_level   : debug
+  type: git
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index c75a7fb..e6860c9 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,19 +1,17 @@
 require 'beaker-rspec/spec_helper'
 require 'beaker-rspec/helpers/serverspec'
 
-unless ENV['RS_PROVISION'] == 'no'
+unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
+  if hosts.first.is_pe?
+    install_pe
+  else
+    install_puppet
+  end
   hosts.each do |host|
     if host['platform'] =~ /debian/
       on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
     end
-    if host.is_pe?
-      install_pe
-    else
-      # Install Puppet
-      install_package host, 'rubygems'
-      on host, 'gem install puppet --no-ri --no-rdoc'
-      on host, "mkdir -p #{host['distmoduledir']}"
-    end
+    on hosts, "mkdir -p #{host['distmoduledir']}"
   end
 end