diff options
| author | varac <varacanero@zeromail.org> | 2014-02-13 17:22:18 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-13 17:22:18 +0100 |
| commit | 761fe6f40058612d6ac0ce88103c9a4f35877ef8 (patch) | |
| tree | cdacb4408633076fde04213fd27a48aa6c990a2e /provider_base | |
| parent | 251c250fe5cf44c99a74d4359cb29b0bf165f3af (diff) | |
| parent | c1d1d9d7cf6fefd1203cc09a66c2e0230b930b5e (diff) | |
Merge branch 'fix_develop' into develop
This was needed so current develop plays nicely with latest leap_cli.
Diffstat (limited to 'provider_base')
| -rw-r--r-- | provider_base/common.json | 1 | ||||
| -rw-r--r-- | provider_base/services/monitor.json | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/provider_base/common.json b/provider_base/common.json index 07a45972..07a58bba 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -16,7 +16,6 @@ }, "ssh": { "authorized_keys": "= authorized_keys", - "known_hosts": "=> known_hosts_file", "port": 22, "mosh": { "ports": "60000:61000", 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": { |