Skip to content

Commit

Permalink
Bug 1144804 - Vagrant: Remove workaround for older versions of puppet
Browse files Browse the repository at this point in the history
This removes the puppet workaround added by bug 1144805, since the
Ubuntu 14.04 vagrant image comes with puppet 3.4.3, and so includes the
fix for:
https://projects.puppetlabs.com/issues/10907
  • Loading branch information
Ed Morley committed Jun 1, 2015
1 parent feb283b commit 9472ffa
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions puppet/manifests/vagrant.pp
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,8 @@
$RABBITMQ_PASSWORD = 'guest'
$RABBITMQ_VHOST = '/'

# We need to force output on_failure, since we're using Puppet 2.x which
# does not have the fix for https://projects.puppetlabs.com/issues/10907
Exec {
path => "/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin",
logoutput => on_failure,
}

line {"etc-hosts":
Expand Down

0 comments on commit 9472ffa

Please sign in to comment.