Merge pull request voxpupuli#280 from hunner/fix_tests

Fix VPCI

Author: bmjen

spec/spec_helper_acceptance.rb

@@ -1,21 +1,10 @@
 #! /usr/bin/env ruby -S rspec
 require 'beaker-rspec'
+require 'beaker/puppet_install_helper'
 
 UNSUPPORTED_PLATFORMS = []
 
-unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  if hosts.first.is_pe?
-    install_pe
-    on hosts, 'mkdir -p /etc/puppetlabs/facter/facts.d'
-  else
-    install_puppet
-    on hosts, 'mkdir -p /etc/facter/facts.d'
-    on hosts, '/bin/touch /etc/puppet/hiera.yaml'
-  end
-  hosts.each do |host|
-    on host, "mkdir -p #{host['distmoduledir']}"
-  end
-end
+run_puppet_install_helper
 
 RSpec.configure do |c|
   # Project root