Merge branch 'master' of /git/ansible

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

View file

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

View file

@ -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 }}