From b3c67cbc8a325d0f70b811c1536d99ab9104295e Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Tue, 13 Oct 2015 17:49:01 +0000
Subject: [PATCH] Use the fedmsg vars I setup for this instead of trying to
 overwrite them with a file.

---
 inventory/group_vars/resultsdb-prod                 |  3 +++
 inventory/group_vars/resultsdb-stg                  |  3 +++
 roles/taskotron/resultsdb-fedmsg/files/resultsdb.py | 10 ----------
 roles/taskotron/resultsdb-fedmsg/tasks/main.yml     |  4 ----
 4 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100644 roles/taskotron/resultsdb-fedmsg/files/resultsdb.py

diff --git a/inventory/group_vars/resultsdb-prod b/inventory/group_vars/resultsdb-prod
index 1541f039aa..43b10d5cf1 100644
--- a/inventory/group_vars/resultsdb-prod
+++ b/inventory/group_vars/resultsdb-prod
@@ -39,6 +39,9 @@ external_hostname: taskotron.fedoraproject.org
 allowed_hosts:
     - 10.5.124
 
+fedmsg_active: True
+fedmsg_cert_prefix: resultsdb
+
 fedmsg_certs:
 - service: shell
   owner: root
diff --git a/inventory/group_vars/resultsdb-stg b/inventory/group_vars/resultsdb-stg
index 33d7164fbe..25552659b7 100644
--- a/inventory/group_vars/resultsdb-stg
+++ b/inventory/group_vars/resultsdb-stg
@@ -53,6 +53,9 @@ execdb_secret_key: "{{ stg_execdb_secret_key }}"
 # fedmsg details
 ############################################################
 
+fedmsg_active: True
+fedmsg_cert_prefix: resultsdb
+
 fedmsg_certs:
 - service: shell
   owner: root
diff --git a/roles/taskotron/resultsdb-fedmsg/files/resultsdb.py b/roles/taskotron/resultsdb-fedmsg/files/resultsdb.py
deleted file mode 100644
index 10525eab46..0000000000
--- a/roles/taskotron/resultsdb-fedmsg/files/resultsdb.py
+++ /dev/null
@@ -1,10 +0,0 @@
-config = {
-    # This should switch fedmsg from passive mode to active mode
-    # which instructs it to connect out to the fedmsg-relay instance described
-    # in /etc/fedmsg.d/relay.py instead of binding to ports and waiting for
-    # listeners.  We need this so that we can push our messages on to the
-    # fedora-infra proper bus from over in the QA network.
-    'active': True,
-    'name': 'relay_inbound',
-    'cert_prefix': 'resultsdb',
-}
diff --git a/roles/taskotron/resultsdb-fedmsg/tasks/main.yml b/roles/taskotron/resultsdb-fedmsg/tasks/main.yml
index 84edb7c9b3..981d918a1f 100644
--- a/roles/taskotron/resultsdb-fedmsg/tasks/main.yml
+++ b/roles/taskotron/resultsdb-fedmsg/tasks/main.yml
@@ -1,6 +1,2 @@
-- copy: src=resultsdb.py dest=/etc/fedmsg.d/resultsdb.py
-  notify:
-    - restart httpd
-
 - name: ensure selinux lets httpd talk to the fedmsg-relay
   seboolean: name=httpd_can_network_connect persistent=yes state=yes