[PATCH 2/2] Merge old Fedora 20 condition with EL 7 one

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

 



---
 roles/nfs/client/tasks/main.yml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/roles/nfs/client/tasks/main.yml b/roles/nfs/client/tasks/main.yml
index 58ee460..138206b 100644
--- a/roles/nfs/client/tasks/main.yml
+++ b/roles/nfs/client/tasks/main.yml
@@ -43,21 +43,12 @@
   tags:
   - nfs/client
 
-- name: enable nfs-related services and run them (fedora20 only)
+- name: enable nfs-related services and run them (rhel 7 and Fedora)
   service: name={{ item }}  enabled=true state=started
   with_items:
   - rpcbind
   - nfs-lock
-  when: ansible_distribution == 'Fedora' and ansible_distribution_major_version|int == 20
-  tags:
-  - nfs/client
-
-- name: enable nfs-related services and run them (rhel7)
-  service: name={{ item }}  enabled=true state=started
-  with_items:
-  - rpcbind
-  - nfs-lock
-  when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7
+  when: ansible_distribution_major_version|int != 6
   tags:
   - nfs/client
 
@@ -68,7 +59,7 @@
   - rpcbind
   - nfs
   - nfslock
-  when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 6
+  when: ansible_distribution_major_version|int == 6
   tags:
   - nfs/client
 
-- 
1.8.3.1
_______________________________________________
infrastructure mailing list
infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
https://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