[PATCH] Simplify fasclient package installation

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Michael Scherer <misc@xxxxxxxx>

Using package, we can merge the yum/dnf duplication, and
we do not need is_rhel, since only EL6 will have ansible_distribution_major_version
at 6.
---
 roles/fas_client/tasks/main.yml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/roles/fas_client/tasks/main.yml b/roles/fas_client/tasks/main.yml
index 8c4ab7f..b22c009 100644
--- a/roles/fas_client/tasks/main.yml
+++ b/roles/fas_client/tasks/main.yml
@@ -9,28 +9,18 @@
 # nss_db is needed to store user/group info.
 #
 - name: install package needed for fas-client (yum)
-  yum: state=present name={{ item }}
+  package: state=present name={{ item }}
   with_items:
   - fas-clients
   - cronie
   tags:
   - packages
   - fas_client
-  when: ansible_distribution_major_version|int < 22
-
-- name: install package needed for fas-client (dnf)
-  dnf: state=present name={{ item }}
-  with_items:
-  - fas-clients
-  - cronie
-  tags:
-  - packages
-  - fas_client
-  when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
+  when: ansible_cmdline.ostree is not defined
 
 - name: install nss_db on rhel hosts only
   yum: state=present name=nss_db
-  when: is_rhel is defined and ansible_distribution_major_version|int == 6
+  when: ansible_distribution_major_version|int == 6
   tags:
   - packages
   - fas_client
-- 
1.8.3.1
_______________________________________________
infrastructure mailing list
infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
http://lists.fedoraproject.org/admin/lists/infrastructure@xxxxxxxxxxxxxxxxxxxxxxx




[Index of Archives]     [Fedora Development]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Yosemite News]     [KDE Users]

  Powered by Linux