From 5a40513875bbb898d88e2c3a7c077564a196029f Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@zarb.org>
Date: Sat, 6 Aug 2016 20:16:35 +0200
Subject: [PATCH] Merge old Fedora 20 condition with EL 7 one

---
 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 58ee460097..138206bd99 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