From b14ceb03bf9bfc77f43f1848400c868a2ab2208f Mon Sep 17 00:00:00 2001 From: elijah Date: Thu, 6 Feb 2014 23:38:00 -0800 Subject: added support for monitor ssh keys (requires latest leap_cli) --- provider_base/services/monitor.json | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'provider_base') diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json index c3e2b954..b6886603 100644 --- a/provider_base/services/monitor.json +++ b/provider_base/services/monitor.json @@ -2,5 +2,11 @@ "nagios": { "nagiosadmin_pw": "= secret :nagios_admin_password", "hosts": "= nodes_like_me.pick_fields('domain.internal', 'ip_address', 'services', 'openvpn.gateway_address')" + }, + "ssh": { + "monitor": { + "username": "= Leap::Platform.monitor_username", + "private_key": "= file(:monitor_priv_key)" + } } } -- cgit v1.2.3 From b9fa9cfc83d552faafe41ebba183fb06f45f6ca5 Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 7 Feb 2014 00:01:42 -0800 Subject: monitor nodes get all nodes listed in /etc/hosts --- provider_base/services/monitor.json | 1 + 1 file changed, 1 insertion(+) (limited to 'provider_base') diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json index b6886603..cf117869 100644 --- a/provider_base/services/monitor.json +++ b/provider_base/services/monitor.json @@ -3,6 +3,7 @@ "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", -- cgit v1.2.3 From 665db30f37838bcebbfdc368f65ed369282c31b8 Mon Sep 17 00:00:00 2001 From: elijah Date: Sun, 9 Feb 2014 17:04:58 -0800 Subject: deploy a valid /etc/ssh/ssh_known_hosts for all nodes (requires new leap_cli) --- provider_base/common.json | 1 - provider_base/services/monitor.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'provider_base') 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": { -- cgit v1.2.3