From 9fe4345ded377b7a1685c04b8a1492f1850552af Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Fri, 7 Nov 2014 19:43:12 +0000
Subject: [PATCH] Only forcibly create this dir on el6.  It should just work on
 el7.

---
 roles/fedmsg/base/tasks/main.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml
index 5ec2aa1ce8..d9c859ca9c 100644
--- a/roles/fedmsg/base/tasks/main.yml
+++ b/roles/fedmsg/base/tasks/main.yml
@@ -13,15 +13,18 @@
   - packages
   - fedmsg/base
 
-# We use setgid here so that the monitoring sockets created by fedmsg services
-# are accessible to the nrpe group.
+# We only need this on el6.  On el7, the fedmsg package uses systemd-tempfiles
+# to generate this effect for us.  Note that at the bottom of this role we add
+# the nrpe user to the fedmsg group so that it has *write* permissions to a unix
+# socket in this dir.
 - name: create a /var/run/fedmsg dir with setgid for monitoring.
   file: >
     dest=/var/run/fedmsg
     mode=2775
     owner=fedmsg
-    group=nrpe
+    group=fedmsg
     state=directory
+  when: ansible_distribution_major_version != '7'
   tags:
   - fedmsg/base