diff options
author | varac <varacanero@zeromail.org> | 2014-02-27 22:43:23 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2014-02-27 22:43:23 +0100 |
commit | 0cd0076f945c0e02bfdc50ff483ceebceec131e2 (patch) | |
tree | 21c631e5bdee5e3019c7fbe4dfac1b04ef325599 /puppet/modules/site_nagios/manifests/server.pp | |
parent | e8cd9ab2d4480aa7c16d15f5db664fa650d4c655 (diff) | |
parent | 66cc1345c3af4e814d98c8e4b90d90158ac9d399 (diff) |
Merge branch 'one_monitornode_rules_them_all' into 0.6
Diffstat (limited to 'puppet/modules/site_nagios/manifests/server.pp')
-rw-r--r-- | puppet/modules/site_nagios/manifests/server.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp index ca38d7fc..9aae8ae8 100644 --- a/puppet/modules/site_nagios/manifests/server.pp +++ b/puppet/modules/site_nagios/manifests/server.pp @@ -7,7 +7,7 @@ class site_nagios::server inherits nagios::base { $nagios_hiera = hiera('nagios') $nagiosadmin_pw = htpasswd_sha1($nagios_hiera['nagiosadmin_pw']) - $hosts = $nagios_hiera['hosts'] + $nagios_hosts = $nagios_hiera['hosts'] include nagios::defaults include nagios::base @@ -43,7 +43,7 @@ class site_nagios::server inherits nagios::base { group => 'nagios', } - create_resources ( site_nagios::add_host_services, $hosts ) + create_resources ( site_nagios::add_host_services, $nagios_hosts ) include site_nagios::server::apache include site_check_mk::server |