Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Stephen Smoogen 2017-05-01 22:38:00 +00:00
commit 527e769f34
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/builders
View file

@ -415,6 +415,8 @@ buildppcle
buildarm buildarm
buildaarch64 buildaarch64
buildvm-s390 buildvm-s390
buildvm-s390x
bkernel
[builders-stg:children] [builders-stg:children]
buildarm-stg buildarm-stg

4
roles/nagios_server/templates/nagios/hosts/staging-hosts.cfg.j2
View file

@ -1,7 +1,11 @@
{% for host in groups['all'] %} {% for host in groups['all'] %}
{% if hostvars[host].datacenter == 'staging' %} {% if hostvars[host].datacenter == 'staging' %}
define host { define host {
{% if hostvars[host].nagios_Check_Services['nrpe'] == true %}
use defaulttemplate use defaulttemplate
{% else %}
use mincheck
{% endif %}
host_name {{ host }} host_name {{ host }}
{% if hostvars[host].ansible_hostname is defined %} {% if hostvars[host].ansible_hostname is defined %}
alias {{ hostvars[host].ansible_hostname }} alias {{ hostvars[host].ansible_hostname }}