diff options
author | varac <varacanero@zeromail.org> | 2013-10-18 14:10:37 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2013-10-18 14:10:37 +0200 |
commit | e142dcb4d4b3f51fa711cb3f4e4957d78110f039 (patch) | |
tree | 0cad8f344236cf6e192a2957fb0d4e577da59dc2 /puppet/modules/site_nagios/manifests/server.pp | |
parent | c884bc04e2eb29bdaacc5c6673ed7f212dc28e88 (diff) | |
parent | 9074a7bce264d64f467bc628f06e37a5802043bd (diff) |
Merge branch 'feature/3909_nagios__Resource_title_must_be' into develop
Diffstat (limited to 'puppet/modules/site_nagios/manifests/server.pp')
-rw-r--r-- | puppet/modules/site_nagios/manifests/server.pp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp index a088921a..3e1ef7e7 100644 --- a/puppet/modules/site_nagios/manifests/server.pp +++ b/puppet/modules/site_nagios/manifests/server.pp @@ -5,9 +5,9 @@ class site_nagios::server inherits nagios::base { stage => setup } - $nagios_hiera=hiera('nagios') + $nagios_hiera = hiera('nagios') $nagiosadmin_pw = htpasswd_sha1($nagios_hiera['nagiosadmin_pw']) - $hosts = $nagios_hiera['hosts'] + $hosts = $nagios_hiera['hosts'] include nagios::defaults include nagios::base @@ -35,6 +35,7 @@ class site_nagios::server inherits nagios::base { group => 'nagios', } - site_nagios::add_host {$hosts:} + create_resources ( site_nagios::add_host, $hosts ) + include site_shorewall::monitor } |