summaryrefslogtreecommitdiff
path: root/provider_base/services
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-02-13 08:46:52 +0100
committervarac <varacanero@zeromail.org>2014-02-13 08:46:52 +0100
commit234d9fdf88d95db79c9d5983af8e0c318edb28c7 (patch)
tree0f85df350d582024bc2aa870711285325fc96bea /provider_base/services
parent251c250fe5cf44c99a74d4359cb29b0bf165f3af (diff)
parent0b3e87cd6916d4ca4404fd2b375d21468d17f343 (diff)
Merge remote-tracking branch 'elijah/feature/known_hosts' into fix_develop
Diffstat (limited to 'provider_base/services')
-rw-r--r--provider_base/services/monitor.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json
index cf117869..53e6b1f1 100644
--- a/provider_base/services/monitor.json
+++ b/provider_base/services/monitor.json
@@ -1,7 +1,7 @@
{
"nagios": {
"nagiosadmin_pw": "= secret :nagios_admin_password",
- "hosts": "= nodes_like_me.pick_fields('domain.internal', 'ip_address', 'services', 'openvpn.gateway_address')"
+ "hosts": "= nodes_like_me[:services => '!monitor'].pick_fields('domain.internal', 'ip_address', 'services', 'openvpn.gateway_address')"
},
"hosts": "= hosts_file(nodes_like_me[:services => '!monitor'])",
"ssh": {