Revert "Turns out that staging fabric is not going to be accesible from where we sit."

This reverts commit 6f1cc1d305.
This commit is contained in:
Ralph Bean 2014-07-25 15:59:06 +00:00
parent 9dcc85c283
commit f64f9ea208
2 changed files with 21 additions and 1 deletions

View file

@ -38,7 +38,19 @@
notify:
- restart moksha-hub
- name: Copy in the broker certificates
- 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
copy: >
src="{{ private }}/files/bugzilla2fedmsg/{{ item }}"
dest="/etc/pki/fedmsg/{{ item }}"
@ -46,6 +58,7 @@
with_items:
- fuse-fabric-fedoraproject.org.crt
- fuse-fabric-fedoraproject.org.key
when: env != 'staging'
notify:
- restart moksha-hub

View file

@ -15,9 +15,16 @@ 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 }}