From 39d45bab43583b023fe7cbc9e159e56549df4619 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 1 May 2017 22:23:42 +0000 Subject: [PATCH 1/2] add some builders to builders for building --- inventory/builders | 2 ++ 1 file changed, 2 insertions(+) diff --git a/inventory/builders b/inventory/builders index d2750efba4..dd001d6fd5 100644 --- a/inventory/builders +++ b/inventory/builders @@ -415,6 +415,8 @@ buildppcle buildarm buildaarch64 buildvm-s390 +buildvm-s390x +bkernel [builders-stg:children] buildarm-stg From 32dc682b1fec2f69ff8420a82d83f6f27f968255 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 1 May 2017 22:34:46 +0000 Subject: [PATCH 2/2] fix staging hosts nrpe checking for staging builders --- .../nagios_server/templates/nagios/hosts/staging-hosts.cfg.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/nagios_server/templates/nagios/hosts/staging-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/staging-hosts.cfg.j2 index 256809c850..168c3d476d 100644 --- 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 }}