Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Let openqa01 publish to the bus.

Browse source
This commit is contained in:
Ralph Bean 2016-03-10 22:44:46 +00:00
parent 4706f17f02
commit c9827a793b
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/proxies
View file

@ -63,6 +63,8 @@ custom_rules: [
# Allow resultsdb talk to the inbound fedmsg relay. # Allow resultsdb talk to the inbound fedmsg relay.
'-A INPUT -p tcp -m tcp --dport 9941 -s 10.5.124.207 -j ACCEPT', '-A INPUT -p tcp -m tcp --dport 9941 -s 10.5.124.207 -j ACCEPT',
# Allow openqa01 to talk to the inbound fedmsg relay.
'-A INPUT -p tcp -m tcp --dport 9941 -s 10.5.131.71 -j ACCEPT',
] ]
fas_client_groups: sysadmin-noc,fi-apprentice fas_client_groups: sysadmin-noc,fi-apprentice

6
roles/fedmsg/base/tasks/main.yml
View file

@ -119,7 +119,7 @@
- relay.py - relay.py
- logging.py - logging.py
- base.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: tags:
- config - config
- fedmsgdconfig - fedmsgdconfig
@ -152,7 +152,7 @@
- restart fedmsg-irc - restart fedmsg-irc
- restart fedmsg-relay - 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: > template: >
src="{{ item }}.j2" src="{{ item }}.j2"
dest="/etc/fedmsg.d/{{ item }}" dest="/etc/fedmsg.d/{{ item }}"
@ -165,7 +165,7 @@
- relay.py - relay.py
- logging.py - logging.py
- base.py - base.py
when: "'persistent-cloud' in group_names" when: "'persistent-cloud' in group_names or 'qa-isolated' in group_names"
tags: tags:
- config - config
- fedmsgdconfig - fedmsgdconfig

2
roles/fedmsg/base/templates/relay.py.j2
View file

@ -24,7 +24,7 @@ config = dict(
# It is also used by the mediawiki php plugin which, due to the oddities of # 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. # php, can't maintain a single passive-bind endpoint of it's own.
relay_inbound=[ 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.. # Stuff from the cloud has to go through our external proxy first..
#"tcp://hub.fedoraproject.org:9941", #"tcp://hub.fedoraproject.org:9941",