summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-02-07 00:01:42 -0800
committerelijah <elijah@riseup.net>2014-02-07 00:01:42 -0800
commitb9fa9cfc83d552faafe41ebba183fb06f45f6ca5 (patch)
tree3ba284dd50ca064047a8b1f1fa3ff91e3db8f474
parentb14ceb03bf9bfc77f43f1848400c868a2ab2208f (diff)
monitor nodes get all nodes listed in /etc/hosts
-rw-r--r--platform.rb2
-rw-r--r--provider_base/services/monitor.json1
2 files changed, 2 insertions, 1 deletions
diff --git a/platform.rb b/platform.rb
index 62fb0215..ee87789a 100644
--- a/platform.rb
+++ b/platform.rb
@@ -4,7 +4,7 @@
Leap::Platform.define do
self.version = "0.3.0"
- self.compatible_cli = "1.3.0".."1.99"
+ self.compatible_cli = "1.3.1".."1.99"
#
# the facter facts that should be gathered
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",