diff options
| author | varac <varacanero@zeromail.org> | 2013-10-20 20:59:22 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-10-20 20:59:22 +0200 |
| commit | d272b9a45b1099a17719fbe3c77b24f10b5de5cb (patch) | |
| tree | fa0b6de2c4be54161bf6b7d81139d26440bbe068 | |
| parent | e142dcb4d4b3f51fa711cb3f4e4957d78110f039 (diff) | |
Possibility to include local puppet recipes (Feature #3976)
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | puppet/manifests/setup.pp | 5 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/default.pp | 5 |
3 files changed, 12 insertions, 1 deletions
@@ -1 +1,2 @@ -.reviewboardrc +/.reviewboardrc +/puppet/modules/site_custom diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp index 84124f5a..f89b7032 100644 --- a/puppet/manifests/setup.pp +++ b/puppet/manifests/setup.pp @@ -32,3 +32,8 @@ if ( $::site_config::params::environment == 'local' ) { include site_config::vagrant } +# if class site_custom::setup exists, include it. +# possibility for users to define custom puppet recipes +if defined( '::site_custom::setup') { + include ::site_custom::setup +} diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp index 2380066a..33d3df05 100644 --- a/puppet/modules/site_config/manifests/default.pp +++ b/puppet/modules/site_config/manifests/default.pp @@ -79,4 +79,9 @@ class site_config::default { include site_postfix::satellite } + # if class site_custom exists, include it. + # possibility for users to define custom puppet recipes + if defined( '::site_custom') { + include ::site_custom + } } |