Merge pull request #532 from hunner/add_helper

Add helper to install puppet/pe/puppet-agent

diff --git a/Gemfile b/Gemfile
index b3facaaad1d05bec420dc71d4e8e9571c3fb9d52..643d3f5d9e0baac476a5e1ac992d4f69fe0ff36a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -29,6 +29,7 @@ group :system_tests do
     gem 'beaker-rspec',  :require => false
   end
   gem 'serverspec',    :require => false
+  gem 'beaker-puppet_install_helper', :require => false
 end
 
 

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index f1e1161546a3d8323f711cc049dba13e773b6011..409ce68b299d2ff4b302ab2e46726d26643017d0 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,20 +1,7 @@
 require 'beaker-rspec'
+require 'beaker/puppet_install_helper'
 
-# Install Puppet
-unless ENV['RS_PROVISION'] == 'no'
-  # This will install the latest available package on el and deb based
-  # systems fail on windows and osx, and install via gem on other *nixes
-  foss_opts = {
-    :default_action => 'gem_install',
-    :version        => (ENV['PUPPET_VERSION'] || '3.8.1'),
-  }
-
-  if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
-
-  hosts.each do |host|
-    on host, "mkdir -p #{host['distmoduledir']}"
-  end
-end
+run_puppet_install_helper
 
 UNSUPPORTED_PLATFORMS = ['RedHat','Suse','windows','AIX','Solaris']