From 2d5b6329ef384dfd9752679dd14ef8f656586c26 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 10 Mar 2016 18:54:08 -0800
Subject: [PATCH] openqa: drop fedmsg/relay role (not needed), drop relay
 'fixes'

let's start over and see where we're at.
---
 playbooks/groups/openqa.yml       |  1 -
 roles/openqa/fixes/tasks/main.yml | 15 ++-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml
index c356d36d02..a730be3216 100644
--- a/playbooks/groups/openqa.yml
+++ b/playbooks/groups/openqa.yml
@@ -45,7 +45,6 @@
    - { role: openqa/dispatcher, tags: ['openqa_dispatcher'] }
    - { role: check-compose, tags: ['check-compose'] }
    - { role: fedmsg/base, tags: ['fedmsg_base', 'fedmsg'] }
-   - { role: fedmsg/relay, tags: ['fedmsg_relay', 'fedmsg'] }
    - { role: fedmsg/hub, tags: ['fedmsg_hub', 'fedmsg'] }
    - { role: openqa/fixes, tags: ['openqa_fixes', 'fedmsg'] }
 
diff --git a/roles/openqa/fixes/tasks/main.yml b/roles/openqa/fixes/tasks/main.yml
index 86c96d275e..a2d0fe60ea 100644
--- a/roles/openqa/fixes/tasks/main.yml
+++ b/roles/openqa/fixes/tasks/main.yml
@@ -4,16 +4,5 @@
 - name: remove internal message source policy
   file: path=/etc/fedmsg.d/policy.py state=absent
 
-- name: use packaged relay.py, not ansible one (just till firewall is fixed)
-  command: cp /etc/fedmsg.d/relay.py.rpmnew /etc/fedmsg.d/relay.py
-  when: fedmsg_env == "stg"
-
-- name: use custom relay.py (external outbound, internal inbound)
-  copy: src=relay.py dest=/etc/fedmsg.d/relay.py owner=root group=root mode=0644
-  when: fedmsg_env != "stg"
-
-- name: restart fedmsg services
-  service: name={{ item }} state=restarted
-  with_items:
-  - fedmsg-hub
-  - fedmsg-relay
+- name: restart fedmsg service
+  service: name=fedmsg-hub state=restarted