diff options
| author | varac <varacanero@zeromail.org> | 2014-02-07 14:50:02 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-07 15:05:50 +0100 |
| commit | cc6c7e10d84aec82fb37529e943799376ac57eda (patch) | |
| tree | 0810c118ceaee95e37dedc03f0a12a461c9cf4b9 /provider_base | |
| parent | 0ca517eabf4b4e2c0dd81c9941e5e503fb2469e1 (diff) | |
| parent | b9fa9cfc83d552faafe41ebba183fb06f45f6ca5 (diff) | |
Merge remote-tracking branch 'origin/develop' into 4982_check_mk
Conflicts:
platform.rb
provider_base/services/monitor.json
Diffstat (limited to 'provider_base')
| -rw-r--r-- | provider_base/services/monitor.json | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json index 142a4b5e..9140901b 100644 --- a/provider_base/services/monitor.json +++ b/provider_base/services/monitor.json @@ -3,6 +3,13 @@ "nagiosadmin_pw": "= secret :nagios_admin_password", "hosts": "= nodes_like_me.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, "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap cert ca`'", |