summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-02-07 14:50:02 +0100
committervarac <varacanero@zeromail.org>2014-02-07 15:05:50 +0100
commitcc6c7e10d84aec82fb37529e943799376ac57eda (patch)
tree0810c118ceaee95e37dedc03f0a12a461c9cf4b9
parent0ca517eabf4b4e2c0dd81c9941e5e503fb2469e1 (diff)
parentb9fa9cfc83d552faafe41ebba183fb06f45f6ca5 (diff)
Merge remote-tracking branch 'origin/develop' into 4982_check_mk
Conflicts: platform.rb provider_base/services/monitor.json
-rw-r--r--platform.rb6
-rw-r--r--provider_base/services/monitor.json7
2 files changed, 13 insertions, 0 deletions
diff --git a/platform.rb b/platform.rb
index 7d84c3fb..95705c76 100644
--- a/platform.rb
+++ b/platform.rb
@@ -43,6 +43,8 @@ Leap::Platform.define do
:user_pgp => 'users/#{arg}/#{arg}_pgp.pub',
:known_hosts => 'files/ssh/known_hosts',
:authorized_keys => 'files/ssh/authorized_keys',
+ :monitor_pub_key => 'files/ssh/monitor_ssh.pub',
+ :monitor_priv_key => 'files/ssh/monitor_ssh',
:ca_key => 'files/ca/ca.key',
:ca_cert => 'files/ca/ca.crt',
:client_ca_key => 'files/ca/client_ca.key',
@@ -73,5 +75,9 @@ Leap::Platform.define do
self.node_files = [
:node_config, :hiera, :node_x509_cert, :node_x509_key, :node_ssh_pub_key
]
+
+ self.monitor_username = 'monitor'
+
+ self.reserved_usernames = ['monitor']
end
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`'",