From d7c79c5cb00c1ea5afc55e7a70be9d46b3b26d4d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 10 Mar 2016 17:30:09 -0800 Subject: [PATCH] openqa/fixes: try a custom relay.py for prod... seems like we need the internal inbound relay but the public outbound relay? I don't even know...but we definitely can't connect to busgateway01.phx2.fedoraproject.org:3999 --- roles/openqa/fixes/files/relay.py | 19 +++++++++++++++++++ roles/openqa/fixes/tasks/main.yml | 4 ++++ 2 files changed, 23 insertions(+) create mode 100644 roles/openqa/fixes/files/relay.py diff --git a/roles/openqa/fixes/files/relay.py b/roles/openqa/fixes/files/relay.py new file mode 100644 index 0000000000..3a0e66845a --- /dev/null +++ b/roles/openqa/fixes/files/relay.py @@ -0,0 +1,19 @@ +config = dict( + endpoints={ + # This is the output side of the relay to which all other + # services can listen. + "relay_outbound": [ + "tcp://127.0.0.1:4001", + ], + }, + relay_inbound=[ + + # Stuff from the cloud has to go through our external proxy first.. + #"tcp://hub.fedoraproject.org:9941", + + # ...and normally, we'd like them to go through round-robin, but we're + # not getting messages in from proxies across the vpn. So, only use + # proxy01 for now. + "tcp://209.132.181.16:9941", + ], +) diff --git a/roles/openqa/fixes/tasks/main.yml b/roles/openqa/fixes/tasks/main.yml index ea33b5964d..86c96d275e 100644 --- a/roles/openqa/fixes/tasks/main.yml +++ b/roles/openqa/fixes/tasks/main.yml @@ -8,6 +8,10 @@ command: cp /etc/fedmsg.d/relay.py.rpmnew /etc/fedmsg.d/relay.py when: fedmsg_env == "stg" +- name: use custom relay.py (external outbound, internal inbound) + copy: src=relay.py dest=/etc/fedmsg.d/relay.py owner=root group=root mode=0644 + when: fedmsg_env != "stg" + - name: restart fedmsg services service: name={{ item }} state=restarted with_items: