summaryrefslogtreecommitdiff
path: root/puppet/manifests/site.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-04-26 11:13:28 +0200
committervarac <varacanero@zeromail.org>2015-04-26 11:13:28 +0200
commitcaa62d845bbc54737aa40931c0b2eca068592dd9 (patch)
treeba7a5f649c9b68776030affc83cc96c73afbc6f6 /puppet/manifests/site.pp
parent8f1d2f308c164796365eadd84d404ee695f32160 (diff)
Exec[] should log the output of the command on failure #6851
Change-Id: If99ae4036f9210516762f5cd7eb66744661a9665
Diffstat (limited to 'puppet/manifests/site.pp')
-rw-r--r--puppet/manifests/site.pp7
1 files changed, 6 insertions, 1 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 57942d99..912234ac 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -1,5 +1,10 @@
# set a default exec path
-Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
+# the logoutput exec parameter defaults to "on_error" in puppet 3,
+# but to "false" in puppet 2.7, so we need to set this globally here
+Exec {
+ logoutput => on_failure,
+ path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin'
+}
include site_config::setup
include site_config::default