Merge branch 'master' of /git/ansible

2026-05-04 01:10:07 +08:00 · 2017-05-01 22:38:00 +00:00
parent f912085403 32dc682b1f
commit 527e769f34
2 changed files with 6 additions and 0 deletions
--- a/inventory/builders
+++ b/inventory/builders
@@ -415,6 +415,8 @@ buildppcle
 buildarm
 buildaarch64
 buildvm-s390
+buildvm-s390x
+bkernel

 [builders-stg:children]
 buildarm-stg
--- a/roles/nagios_server/templates/nagios/hosts/staging-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/staging-hosts.cfg.j2
@@ -1,7 +1,11 @@
 {% for host in groups['all'] %}
 {% if hostvars[host].datacenter == 'staging' %}
 define host {
+{% if hostvars[host].nagios_Check_Services['nrpe'] == true %}
   use                     defaulttemplate
+{% else %}
+  use                          mincheck
+{% endif %}
  host_name               {{ host }}
 {% if hostvars[host].ansible_hostname is defined %}
   alias                   {{ hostvars[host].ansible_hostname }}