diff options
| author | Ralph Bean <rbean@redhat.com> | 2016-03-10 22:44:46 +0000 |
|---|---|---|
| committer | Ralph Bean <rbean@redhat.com> | 2016-03-10 22:44:51 +0000 |
| commit | c9827a793b31867435e2bb91be41c3ff1a146432 (patch) | |
| tree | 5798e09ba005c5d1dff66dc84e8d54a274f8a43c /roles/fedmsg/base | |
| parent | 4706f17f024cf861119ef90e09cc815d73d7df59 (diff) | |
| download | ansible-c9827a793b31867435e2bb91be41c3ff1a146432.tar.gz ansible-c9827a793b31867435e2bb91be41c3ff1a146432.tar.xz ansible-c9827a793b31867435e2bb91be41c3ff1a146432.zip | |
Let openqa01 publish to the bus.
Diffstat (limited to 'roles/fedmsg/base')
| -rw-r--r-- | roles/fedmsg/base/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/fedmsg/base/templates/relay.py.j2 | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml index c4bbe6391..16d751df0 100644 --- a/roles/fedmsg/base/tasks/main.yml +++ b/roles/fedmsg/base/tasks/main.yml @@ -119,7 +119,7 @@ - relay.py - logging.py - base.py - when: "'persistent-cloud' not in group_names" + when: "'persistent-cloud' not in group_names and 'qa-isolated' not in group_names" tags: - config - fedmsgdconfig @@ -152,7 +152,7 @@ - restart fedmsg-irc - restart fedmsg-relay -- name: setup basic /etc/fedmsg.d/ contents for cloud hosts +- name: setup basic /etc/fedmsg.d/ contents for firewalled/external hosts template: > src="{{ item }}.j2" dest="/etc/fedmsg.d/{{ item }}" @@ -165,7 +165,7 @@ - relay.py - logging.py - base.py - when: "'persistent-cloud' in group_names" + when: "'persistent-cloud' in group_names or 'qa-isolated' in group_names" tags: - config - fedmsgdconfig diff --git a/roles/fedmsg/base/templates/relay.py.j2 b/roles/fedmsg/base/templates/relay.py.j2 index 79733297b..82cd0f957 100644 --- a/roles/fedmsg/base/templates/relay.py.j2 +++ b/roles/fedmsg/base/templates/relay.py.j2 @@ -24,7 +24,7 @@ config = dict( # It is also used by the mediawiki php plugin which, due to the oddities of # php, can't maintain a single passive-bind endpoint of it's own. relay_inbound=[ - {% if 'persistent-cloud' in group_names or 'jenkins-master' in group_names %} + {% if 'persistent-cloud' in group_names or 'jenkins-master' in group_names or 'qa-isolated' in group_names %} # Stuff from the cloud has to go through our external proxy first.. #"tcp://hub.fedoraproject.org:9941", |