diff options
| author | elijah <elijah@riseup.net> | 2015-07-09 12:18:21 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-07-09 12:18:21 -0700 |
| commit | 2d50141b8b0b223e3b437ff3bda0dd2dc7a64ef5 (patch) | |
| tree | b70ec2d4723400a9796fee726024d131384f25f3 /puppet/modules/site_check_mk/manifests/server.pp | |
| parent | 1e872b71382f94f9c2d63ccbcaa43ca7d6741b42 (diff) | |
| parent | ec24733308676d6822aaeaae6c17b042f7e2bf14 (diff) | |
Merge branch 'develop' of ssh://leap.se/leap_platform into develop
Diffstat (limited to 'puppet/modules/site_check_mk/manifests/server.pp')
| -rw-r--r-- | puppet/modules/site_check_mk/manifests/server.pp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp index 171f1576..67519513 100644 --- a/puppet/modules/site_check_mk/manifests/server.pp +++ b/puppet/modules/site_check_mk/manifests/server.pp @@ -1,3 +1,4 @@ +# setup check_mk on the monitoring server class site_check_mk::server { $ssh_hash = hiera('ssh') @@ -6,10 +7,9 @@ class site_check_mk::server { $seckey = $ssh_hash['monitor']['private_key'] $nagios_hiera = hiera_hash('nagios') - $nagios_hosts = $nagios_hiera['hosts'] + $hosts = $nagios_hiera['hosts'] - $hosts = hiera_hash('hosts') - $all_hosts = inline_template ('<% @hosts.keys.sort.each do |key| -%>"<%= @hosts[key]["domain_internal"] %>", <% end -%>') + $all_hosts = inline_template ('<% @hosts.keys.sort.each do |key| -%><% if @hosts[key]["environment"] != "disabled" %>"<%= @hosts[key]["domain_internal"] %>", <% end -%><% end -%>') $domains_internal = $nagios_hiera['domains_internal'] $environments = $nagios_hiera['environments'] |