From 6f1cc1d3054bfd2a0d94a96ba945bb8f022abe88 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Tue, 24 Jun 2014 15:37:34 +0000
Subject: [PATCH] Turns out that staging fabric is not going to be accesible
 from where we sit.

---
 roles/bugzilla2fedmsg/tasks/main.yml              | 15 +--------------
 .../bugzilla2fedmsg/templates/bugzilla2fedmsg.ini |  7 -------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/roles/bugzilla2fedmsg/tasks/main.yml b/roles/bugzilla2fedmsg/tasks/main.yml
index 92393214f4..72714bafc5 100644
--- a/roles/bugzilla2fedmsg/tasks/main.yml
+++ b/roles/bugzilla2fedmsg/tasks/main.yml
@@ -38,19 +38,7 @@
   notify:
   - restart moksha-hub
 
-- name: Copy in the staging certificates
-  copy: >
-    src="{{ private }}/files/bugzilla2fedmsg/{{ item }}"
-    dest="/etc/pki/fedmsg/{{ item }}"
-    mode=0640 owner=fedmsg group=fedmsg
-  with_items:
-  - fedora.devel.engineering.redhat.com.crt
-  - fedora.devel.engineering.redhat.com.key
-  when: env == 'staging'
-  notify:
-  - restart moksha-hub
-
-- name: Copy in the production certificates
+- name: Copy in the broker certificates
   copy: >
     src="{{ private }}/files/bugzilla2fedmsg/{{ item }}"
     dest="/etc/pki/fedmsg/{{ item }}"
@@ -58,7 +46,6 @@
   with_items:
   - fuse-fabric-fedoraproject.org.crt 
   - fuse-fabric-fedoraproject.org.key
-  when: env != 'staging'
   notify:
   - restart moksha-hub
 
diff --git a/roles/bugzilla2fedmsg/templates/bugzilla2fedmsg.ini b/roles/bugzilla2fedmsg/templates/bugzilla2fedmsg.ini
index eab2635f12..05082c6154 100644
--- a/roles/bugzilla2fedmsg/templates/bugzilla2fedmsg.ini
+++ b/roles/bugzilla2fedmsg/templates/bugzilla2fedmsg.ini
@@ -15,16 +15,9 @@ bugzilla.username = {{ bugzilla_user }}
 bugzilla.password = {{ bugzilla_password }}
 
 # Stomp broker configuration.
-{% if env == 'staging' %}
-stomp_uri = fuse-fabric-01.stg.jboss.org:61617,fuse-fabric-02.stg.jboss.org:61617,fuse-fabric-03.stg.jboss.org:61617
-stomp_ssl_crt = /etc/pki/fedmsg/fedora.devel.engineering.redhat.com.crt
-stomp_ssl_key = /etc/pki/fedmsg/fedora.devel.engineering.redhat.com.key
-{% else %}
 stomp_uri = fuse-fabric-01.jboss.org:61617,fuse-fabric-02.jboss.org:61617,fuse-fabric-03.jboss.org:61617
 stomp_ssl_crt = /etc/pki/fedmsg/fuse-fabric-fedoraproject.org.crt
 stomp_ssl_key = /etc/pki/fedmsg/fuse-fabric-fedoraproject.org.key
-{% endif %}
-
 stomp_user = {{ redhat_dmz_broker_username }}
 stomp_pass = {{ redhat_dmz_broker_password }}