From 7d6f4c12acfa29fa4e2d34cb735e262cc10d670e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 1 Jun 2022 12:10:05 -0700 Subject: [PATCH] add some rhel9 conditionals for collectd, but remove for nagios Signed-off-by: Kevin Fenzi --- playbooks/groups/dns.yml | 4 ++-- playbooks/groups/virthost.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/groups/dns.yml b/playbooks/groups/dns.yml index fbf5a352ea..46009f320b 100644 --- a/playbooks/groups/dns.yml +++ b/playbooks/groups/dns.yml @@ -20,8 +20,8 @@ - { role: openvpn/client, when: datacenter != 'iad2' } - ipa/client - - collectd/base - - collectd/bind + - { role: collectd/base, when: ansible_distribution_version|int < 9.0 } + - { role: collectd/bind, when: ansible_distribution_version|int < 9.0 } - rsyncd - sudo - dns diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 19040ee35a..7532451489 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -37,7 +37,7 @@ roles: - base - { role: rkhunter, when: ansible_distribution_version|int < 9.0 } - - { role: nagios_client, when: ansible_distribution_version|int < 9.0 } + - { role: nagios_client } - hosts - { role: openvpn/client, when: vpn|bool } - ipa/client