diff options
| author | varac <varacanero@zeromail.org> | 2013-01-27 11:15:36 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-01-27 11:15:36 +0100 |
| commit | 078bc9674c247cc2c3ad715eec57903138e481e1 (patch) | |
| tree | 8808414a63573d138f904cda4a894705005071cf | |
| parent | ca6347905e4293883b196f6e2120754fb823ae49 (diff) | |
added 'development' hiera hash to exclude certain class for better testing
| -rw-r--r-- | provider_base/common.json | 5 | ||||
| -rw-r--r-- | puppet/manifests/site.pp | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/provider_base/common.json b/provider_base/common.json index 74eb494c..8ffe8cd4 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -25,5 +25,8 @@ "ca_cert": "= try_file :ca_cert" }, "local": false, - "service_type": "internal_service" + "service_type": "internal_service", + "development": { + "site_config": true + } } diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 94835f61..1a76e3bd 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -6,8 +6,13 @@ node 'default' { import 'common' include concat::setup - # include some basic classes - include site_config + $development = hiera('development') + if $development['site_config'] == true { + # include some basic classes + include site_config + } else { + notice ('NOT applying site_config') + } # parse services for host $services=hiera_array('services') @@ -30,7 +35,7 @@ node 'default' { include site_ca_daemon } - if 'monitoring' in $services { + if 'monitor' in $services { include site_nagios::server } } |