From 4ba623cabaea06bbc7e14d3101183824463f0a6f Mon Sep 17 00:00:00 2001
From: Ricky Elrod <codeblock@fedoraproject.org>
Date: Wed, 9 Aug 2017 05:14:18 +0000
Subject: [PATCH] try this instead because I have no idea what brings
 python2-fedmsg-consumers in

Signed-off-by: Ricky Elrod <codeblock@fedoraproject.org>
---
 playbooks/groups/proxies.yml                             | 2 ++
 roles/fedmsg/gateway/tasks/main.yml                      | 9 ---------
 roles/fedmsg/{gateway => hotfix}/files/consumers-init.py | 0
 roles/fedmsg/hotfix/tasks/main.yml                       | 9 +++++++++
 4 files changed, 11 insertions(+), 9 deletions(-)
 rename roles/fedmsg/{gateway => hotfix}/files/consumers-init.py (100%)
 create mode 100644 roles/fedmsg/hotfix/tasks/main.yml

diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml
index edbd80539d..1e6dc8e00a 100644
--- a/playbooks/groups/proxies.yml
+++ b/playbooks/groups/proxies.yml
@@ -27,6 +27,8 @@
   - { role: certbot,
       when: inventory_hostname == 'proxy01.phx2.fedoraproject.org' }
   - apache
+  # Hack because I don't know where python2-fedmsg-consumers comes from
+  - fedmsg/hotfix
 
   tasks:
   - name: install special fpaste.conf with letsencrypt info
diff --git a/roles/fedmsg/gateway/tasks/main.yml b/roles/fedmsg/gateway/tasks/main.yml
index 385ae1c839..cdbb31b9fb 100644
--- a/roles/fedmsg/gateway/tasks/main.yml
+++ b/roles/fedmsg/gateway/tasks/main.yml
@@ -40,15 +40,6 @@
   notify:
   - restart fedmsg-gateway
 
-- name: "[HOTFIX] Fix consumers/__init__.py"
-  copy: src=consumers-init.py dest=/usr/lib/python2.7/site-packages/fedmsg/consumers/__init__.py
-  tags:
-  - fedmsg/gateway
-  - hotfix
-  when: inventory_hostname.startswith(('proxy11', 'proxy12', 'proxy13'))
-  notify:
-  - restart fedmsg-gateway
-
 - name: enable on boot and start fedmsg-gateway
   service: name=fedmsg-gateway state=started enabled=true
   tags:
diff --git a/roles/fedmsg/gateway/files/consumers-init.py b/roles/fedmsg/hotfix/files/consumers-init.py
similarity index 100%
rename from roles/fedmsg/gateway/files/consumers-init.py
rename to roles/fedmsg/hotfix/files/consumers-init.py
diff --git a/roles/fedmsg/hotfix/tasks/main.yml b/roles/fedmsg/hotfix/tasks/main.yml
new file mode 100644
index 0000000000..6d75292fd2
--- /dev/null
+++ b/roles/fedmsg/hotfix/tasks/main.yml
@@ -0,0 +1,9 @@
+---
+- name: "[HOTFIX] Fix consumers/__init__.py"
+  copy: src=consumers-init.py dest=/usr/lib/python2.7/site-packages/fedmsg/consumers/__init__.py
+  tags:
+  - fedmsg/gateway
+  - hotfix
+  when: inventory_hostname.startswith(('proxy11', 'proxy12', 'proxy13'))
+  notify:
+  - restart fedmsg-gateway