Skip to content

Commit f818fbe

Browse files
author
Ashley Penney
committed
Fix for Ubuntu 14.04.
1 parent 6f5bd1a commit f818fbe

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

spec/spec_helper_acceptance.rb

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,20 @@ def psql(psql_cmd, user = 'postgres', exit_codes = [0], &block)
3434
shell("su #{shellescape(user)} -c #{shellescape(psql)}", :acceptable_exit_codes => exit_codes, &block)
3535
end
3636

37-
hosts.each do |host|
38-
if host['platform'] =~ /debian/
39-
on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
40-
end
41-
if host.is_pe?
37+
unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
38+
if hosts.first.is_pe?
4239
install_pe
4340
else
44-
# Install Puppet
45-
install_package host, 'rubygems'
46-
on host, 'gem install puppet --no-ri --no-rdoc'
47-
on host, "mkdir -p #{host['distmoduledir']}"
48-
osfamily = fact 'osfamily'
49-
# install augeas dependencies
50-
if osfamily =~ /Debian/
51-
install_package host, 'ruby-dev'
52-
install_package host, 'libaugeas-dev'
53-
end
54-
if osfamily =~ /RedHat/
41+
install_puppet
42+
end
43+
hosts.each do |host|
44+
on hosts, "mkdir -p #{host['distmoduledir']}"
45+
# Augeas is only used in one place, for Redhat.
46+
if fact('osfamily') == 'RedHat'
5547
install_package host, 'ruby-devel'
5648
install_package host, 'augeas-devel'
49+
install_package host, 'ruby-augeas'
5750
end
58-
on host, 'gem install ruby-augeas --no-ri --no-rdoc'
5951
end
6052
end
6153

0 commit comments

Comments
 (0)