summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-04-08 20:36:27 +0200
committervarac <varacanero@zeromail.org>2015-04-08 20:36:27 +0200
commit7bb8b2e0685b3738c7842e86c09b826c2732e8bd (patch)
tree4e8624608e059ab5212f7d6cb9a20691bca27822 /puppet/modules/site_config/manifests
parent5f237d891bebe8ac822e5a8182da0458ae0c10ef (diff)
set the 'logoutput' parameter for any exec type to 'on_error'
Change-Id: I04c796a502db52f3a594ef4c3cf08c330839bc13
Diffstat (limited to 'puppet/modules/site_config/manifests')
-rw-r--r--puppet/modules/site_config/manifests/default.pp4
1 files changed, 4 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index aa49f930..c15080f5 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -1,6 +1,10 @@
class site_config::default {
tag 'leap_base'
+ # 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 }
+
$services = hiera('services', [])
$domain_hash = hiera('domain')
include site_config::params