From 921add132029f1e7d48e26f78fdf7d92ebd19dab Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 24 Jan 2023 16:07:50 -0800 Subject: [PATCH] dns: adjust conditionals for dns servers using rhel9 Signed-off-by: Kevin Fenzi --- playbooks/groups/dns.yml | 4 ++-- roles/rsyncd/tasks/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/playbooks/groups/dns.yml b/playbooks/groups/dns.yml index 46009f320b..fbf5a352ea 100644 --- a/playbooks/groups/dns.yml +++ b/playbooks/groups/dns.yml @@ -20,8 +20,8 @@ - { role: openvpn/client, when: datacenter != 'iad2' } - ipa/client - - { role: collectd/base, when: ansible_distribution_version|int < 9.0 } - - { role: collectd/bind, when: ansible_distribution_version|int < 9.0 } + - collectd/base + - collectd/bind - rsyncd - sudo - dns diff --git a/roles/rsyncd/tasks/main.yml b/roles/rsyncd/tasks/main.yml index b2f488f172..7e16f59c73 100644 --- a/roles/rsyncd/tasks/main.yml +++ b/roles/rsyncd/tasks/main.yml @@ -25,7 +25,7 @@ tags: - packages - rsyncd - when: (ansible_distribution_major_version|int >= 30 and ansible_distribution == 'Fedora' and ansible_distribution_major_version|int < 34 and ansible_distribution == 'Fedora') or (ansible_distribution == 'RedHat' and ansible_distribution_major_version|int >= 8) + when: (ansible_distribution_major_version|int >= 30 and ansible_distribution == 'Fedora' and ansible_distribution_major_version|int < 34 and ansible_distribution == 'Fedora') or (ansible_distribution == 'RedHat' and ansible_distribution_major_version|int = 8) - name: install necessary packages for fedora >= 34 package: @@ -36,7 +36,7 @@ tags: - packages - rsyncd - when: (ansible_distribution_major_version|int >= 34 and ansible_distribution == 'Fedora') or (ansible_distribution == 'RedHat' and ansible_distribution_major_version|int >= 8) + when: (ansible_distribution_major_version|int >= 34 and ansible_distribution == 'Fedora') or (ansible_distribution == 'RedHat' and ansible_distribution_major_version|int > 8) - name: rsyncd.conf file copy: src={{ item }} dest=/etc/rsyncd.conf mode=0644