diff options
| author | Stephen Smoogen <smooge@redhat.com> | 2017-05-01 22:38:00 +0000 |
|---|---|---|
| committer | Stephen Smoogen <smooge@redhat.com> | 2017-05-01 22:38:00 +0000 |
| commit | 527e769f34fbc578b6060aa2cef78b83ee0fb323 (patch) | |
| tree | 6e4e113cdb1f2ad59e6aad0d8cade7da5d6e00d5 | |
| parent | f91208540382017a8c85a2eaad0874d792f270f1 (diff) | |
| parent | 32dc682b1fec2f69ff8420a82d83f6f27f968255 (diff) | |
| download | ansible-527e769f34fbc578b6060aa2cef78b83ee0fb323.tar.gz ansible-527e769f34fbc578b6060aa2cef78b83ee0fb323.tar.xz ansible-527e769f34fbc578b6060aa2cef78b83ee0fb323.zip | |
Merge branch 'master' of /git/ansible
| -rw-r--r-- | inventory/builders | 2 | ||||
| -rw-r--r-- | roles/nagios_server/templates/nagios/hosts/staging-hosts.cfg.j2 | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/inventory/builders b/inventory/builders index d2750efba..dd001d6fd 100644 --- a/inventory/builders +++ b/inventory/builders @@ -415,6 +415,8 @@ buildppcle buildarm buildaarch64 buildvm-s390 +buildvm-s390x +bkernel [builders-stg:children] buildarm-stg 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 256809c85..168c3d476 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 }} |