summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorMorgan Haskel <morgan@puppetlabs.com>2014-08-28 18:30:39 -0400
committerMorgan Haskel <morgan@puppetlabs.com>2014-08-28 18:30:39 -0400
commit2023692fc98ae4a68fb702f232ba0d3c5f474313 (patch)
treec3e01e15c9924eba9f6a6e23f142d528940406ea /spec
parente6eb863a2af608fa96b40a55888f2d105e53dd5a (diff)
Update spec_helper for more consistency
Diffstat (limited to 'spec')
-rwxr-xr-xspec/spec_helper_acceptance.rb15
1 files changed, 7 insertions, 8 deletions
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index e9ccc68..53c1661 100755
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -4,16 +4,15 @@ require 'beaker-rspec'
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
+ # 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' }
+
+ if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
+
hosts.each do |host|
on host, "mkdir -p #{host['distmoduledir']}"
+ on host, "/bin/touch #{default['puppetpath']}/hiera.yaml"
end
end