diff options
author | Varac <varac@leap.se> | 2014-10-22 20:42:30 +0800 |
---|---|---|
committer | Gerrit Code Review <gerrit2@review.leap.se> | 2014-10-22 20:42:30 +0800 |
commit | a936a12ca449a844174baad841332f2c5a9a2bff (patch) | |
tree | a0c4a89a23d8bbd89fcfa0b3d3f656682b29cfb5 /puppet/modules/site_config/manifests | |
parent | 51a1e1c6db33ed2868ec74728f854237e3dfd86a (diff) | |
parent | f6ffad33042aa6580ec00ef23836291861c1ae17 (diff) |
Merge "implement custom puppet support (#6201, #6226)" into develop
Diffstat (limited to 'puppet/modules/site_config/manifests')
-rw-r--r-- | puppet/modules/site_config/manifests/default.pp | 6 |
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 |