]> review.fuel-infra Code Review - puppet-modules/puppetlabs-firewall.git/commitdiff
Update the spec_helper for consistency.
authorMorgan Haskel <morgan@puppetlabs.com>
Thu, 28 Aug 2014 15:29:20 +0000 (11:29 -0400)
committerMorgan Haskel <morgan@puppetlabs.com>
Thu, 28 Aug 2014 15:29:20 +0000 (11:29 -0400)
spec/spec_helper_acceptance.rb

index 4f0fc947e01aee75decd80381e090a858a0baaef..ca29ce1cb759c56db47ccb2e4bdf82f5d6f0f2aa 100644 (file)
@@ -13,11 +13,12 @@ def ip6tables_flush_all_tables
 end
 
 unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  if hosts.first.is_pe?
-    install_pe
-  else
-    install_puppet
-  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']}"
   end