Skip to content

Commit

Permalink
Merge pull request redhat-openstack#223 from mhaskel/spec_helper_fix
Browse files Browse the repository at this point in the history
stdlib installation wasn't working
  • Loading branch information
cyberious committed Nov 4, 2014
2 parents bb52d23 + 0718d95 commit d0fe294
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
apply_manifest_on(host, 'package{"git":}')
on host, 'git clone -b 4.3.x https://github.com/puppetlabs/puppetlabs-stdlib /etc/puppetlabs/puppet/modules/stdlib'
else
on host, puppet_module_install('puppetlabs/stdlib')
on host, puppet('module install puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
end
end
end
Expand All @@ -38,7 +38,6 @@
c.before :suite do
hosts.each do |host|
on host, "mkdir -p #{host['distmoduledir']}/ntp"
on host, puppet('module install puppetlabs-stdlib')
%w(lib manifests templates metadata.json).each do |file|
scp_to host, "#{proj_root}/#{file}", "#{host['distmoduledir']}/ntp"
end
Expand Down

0 comments on commit d0fe294

Please sign in to comment.