From 2b048c744b4bf0c86618d25e71c94124d754b620 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Mon, 18 May 2015 18:08:32 +0000
Subject: [PATCH] (pagure) Install fedmsg-relay before trying to start it.

---
 playbooks/groups/pagure.yml        | 12 ++++++++++++
 roles/pagure/fedmsg/tasks/main.yml |  6 ------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml
index 79d3442376..bb9ca68a86 100644
--- a/playbooks/groups/pagure.yml
+++ b/playbooks/groups/pagure.yml
@@ -54,6 +54,18 @@
    - "/srv/private/ansible/vars.yml"
    - "{{ vars_path }}/{{ ansible_distribution }}.yml"
 
+  pre_tasks:
+  - name: install fedmsg-relay
+    yum: pkg=fedmsg-relay state=present
+    tags:
+    - pagure
+    - pagure/fedmsg
+  - name: and start it
+    service: name=fedmsg-relay state=started
+    tags:
+    - pagure
+    - pagure/fedmsg
+
   roles:
   - pagure/frontend
   - pagure/fedmsg
diff --git a/roles/pagure/fedmsg/tasks/main.yml b/roles/pagure/fedmsg/tasks/main.yml
index c938e4b48c..fb859260e9 100644
--- a/roles/pagure/fedmsg/tasks/main.yml
+++ b/roles/pagure/fedmsg/tasks/main.yml
@@ -147,9 +147,3 @@
   - selinux
   - pagure
   - pagure/fedmsg
-
-- name: start fedmsg-relay
-  service: name=fedmsg-relay state=running enabled=yes
-  tags:
-  - pagure
-  - pagure/fedmsg