Only call install_* methods once
This commit is contained in:
parent
13afe8b7af
commit
ae28193ce4
1 changed files with 7 additions and 6 deletions
|
@ -2,13 +2,14 @@ require 'beaker-rspec'
|
||||||
|
|
||||||
# Install Puppet
|
# Install Puppet
|
||||||
unless ENV['RS_PROVISION'] == 'no'
|
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' }
|
||||||
|
|
||||||
|
if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
|
||||||
|
|
||||||
hosts.each do |host|
|
hosts.each do |host|
|
||||||
if host.is_pe?
|
on host, "mkdir -p #{host['distmoduledir']}"
|
||||||
install_pe
|
|
||||||
else
|
|
||||||
install_puppet
|
|
||||||
on host, "mkdir -p #{host['distmoduledir']}"
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue