[PATCH 2/3] Use package module, so we can simplify the package installation

[misc@xxxxxxxx]

From: Michael Scherer <misc@xxxxxxxx>

---
 roles/base/tasks/watchdog.yml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/roles/base/tasks/watchdog.yml b/roles/base/tasks/watchdog.yml
index 6ae0d54..feebcfc 100644
--- a/roles/base/tasks/watchdog.yml
+++ b/roles/base/tasks/watchdog.yml
@@ -4,24 +4,14 @@
   register: watchdog_dev
 
 - name: install watchdog
-  yum: pkg={{ item }} state=present
+  package: pkg={{ item }} state=present
   with_items:
   - watchdog
   tags:
   - packages
   - watchdog
   - base
-  when: ansible_distribution_major_version|int < 22 and ansible_virtualization_role == 'guest' and watchdog_dev.stat.exists
-
-- name: install watchdog
-  dnf: pkg={{ item }} state=present
-  with_items:
-  - watchdog
-  tags:
-  - packages
-  - watchdog
-  - base
-  when: ansible_distribution_major_version|int > 21 and ansible_virtualization_role == 'guest' and watchdog_dev.stat.exists
+  when: ansible_virtualization_role == 'guest' and watchdog_dev.stat.exists
 
 - name: watchdog device configuration
   copy: src=watchdog.conf dest=/etc/watchdog.conf owner=root group=root mode=644
-- 
1.8.3.1
_______________________________________________
infrastructure mailing list
infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
http://lists.fedoraproject.org/admin/lists/infrastructure@xxxxxxxxxxxxxxxxxxxxxxx