summaryrefslogtreecommitdiff
path: root/provider_base/services
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-02-12 12:54:20 +0100
committervarac <varacanero@zeromail.org>2014-02-12 12:54:20 +0100
commit245ad19a443434196b897c9a2310e7507e925fcd (patch)
treecca6f9e0476dc7ad31a1c28a923d05f2d03e887e /provider_base/services
parent6255e58bf9ff3489bf2707bc2be9759ec5c7db68 (diff)
parent0b3e87cd6916d4ca4404fd2b375d21468d17f343 (diff)
Merge remote-tracking branch 'elijah/feature/known_hosts' into 0.6
Conflicts: provider_base/services/monitor.json
Diffstat (limited to 'provider_base/services')
-rw-r--r--provider_base/services/monitor.json9
1 files changed, 8 insertions, 1 deletions
diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json
index 142a4b5e..5656fe80 100644
--- a/provider_base/services/monitor.json
+++ b/provider_base/services/monitor.json
@@ -1,7 +1,14 @@
{
"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": {
+ "monitor": {
+ "username": "= Leap::Platform.monitor_username",
+ "private_key": "= file(:monitor_priv_key)"
+ }
},
"x509": {
"use": true,