summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests/default.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2014-10-20 21:44:37 -0400
committerMicah Anderson <micah@leap.se>2014-10-21 16:43:30 -0400
commitf6ffad33042aa6580ec00ef23836291861c1ae17 (patch)
treeb2f45138bea980e080779c3f139a5c25f64b988b /puppet/modules/site_config/manifests/default.pp
parent189bd4b704ba685640ca01afe90f592e7b33567a (diff)
implement custom puppet support (#6201, #6226)
change puppet command to include in the --modulepath /srv/leap/files/puppet/modules If a provider places puppet code under files/puppet it will be sync'd over to all the nodes, once leap cli #6225 is merged. The custom puppet entry point is in class 'custom' which can be put into files/puppet/modules/custom/manifests/init.pp Change-Id: I74879c6ee056b03cd4691aa81a7668b60383bdad
Diffstat (limited to 'puppet/modules/site_config/manifests/default.pp')
-rw-r--r--puppet/modules/site_config/manifests/default.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index fc2179de..790b5a16 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -59,10 +59,10 @@ class site_config::default {
include site_postfix::satellite
}
- # if class site_custom exists, include it.
+ # if class custom exists, include it.
# possibility for users to define custom puppet recipes
- if defined( '::site_custom') {
- include ::site_custom
+ if defined( '::custom') {
+ include ::custom
}
include site_check_mk::agent