Merge pull request #175 from apenney/fix-1404
Improve this so it works on Ubuntu 14.04.
This commit is contained in:
commit
7ede29bd8e
1 changed files with 6 additions and 9 deletions
|
@ -1,17 +1,14 @@
|
||||||
require 'beaker-rspec/spec_helper'
|
require 'beaker-rspec/spec_helper'
|
||||||
require 'beaker-rspec/helpers/serverspec'
|
require 'beaker-rspec/helpers/serverspec'
|
||||||
|
|
||||||
hosts.each do |host|
|
unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
|
||||||
if host['platform'] =~ /debian/
|
if hosts.first.is_pe?
|
||||||
on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
|
|
||||||
end
|
|
||||||
if host.is_pe?
|
|
||||||
install_pe
|
install_pe
|
||||||
else
|
else
|
||||||
# Install Puppet
|
install_puppet
|
||||||
install_package host, 'rubygems'
|
end
|
||||||
on host, 'gem install puppet --no-ri --no-rdoc'
|
hosts.each do |host|
|
||||||
on host, "mkdir -p #{host['distmoduledir']}"
|
on hosts, "mkdir -p #{host['distmoduledir']}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue