From d26b6e837dac9bb0d001d259e7362754d2093fdf Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 24 Jun 2015 19:59:38 +0000 Subject: [PATCH] Give an extra fedmsg endpoint for koschei-watcher. --- inventory/group_vars/koschei | 4 ++-- inventory/group_vars/koschei-stg | 4 ++-- roles/fedmsg/base/templates/endpoints.py.j2 | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/inventory/group_vars/koschei b/inventory/group_vars/koschei index 504700c04a..db4bcf9600 100644 --- a/inventory/group_vars/koschei +++ b/inventory/group_vars/koschei @@ -18,8 +18,8 @@ koschei_bugzilla: bugzilla.redhat.com tcp_ports: [ 80, 443, - # These 3 are for fedmsg. See also /etc/fedmsg.d/endpoints.py - 3000, 3001, 3002, + # These 4 are for fedmsg. See also /etc/fedmsg.d/endpoints.py + 3000, 3001, 3002, 3003, ] custom_rules: [ diff --git a/inventory/group_vars/koschei-stg b/inventory/group_vars/koschei-stg index 0d06b1b60f..b297f0f081 100644 --- a/inventory/group_vars/koschei-stg +++ b/inventory/group_vars/koschei-stg @@ -18,8 +18,8 @@ koschei_bugzilla: partner-bugzilla.redhat.com tcp_ports: [ 80, 443, - # These 3 are for fedmsg. See also /etc/fedmsg.d/endpoints.py - 3000, 3001, 3002, + # These 4 are for fedmsg. See also /etc/fedmsg.d/endpoints.py + 3000, 3001, 3002, 3003 ] custom_rules: [ diff --git a/roles/fedmsg/base/templates/endpoints.py.j2 b/roles/fedmsg/base/templates/endpoints.py.j2 index c7fd980808..da4cc83c20 100644 --- a/roles/fedmsg/base/templates/endpoints.py.j2 +++ b/roles/fedmsg/base/templates/endpoints.py.j2 @@ -78,13 +78,14 @@ config = dict( for i in range(2) ], - # mizdebsk says he thinks we'll need three sockets. Two services + # mizdebsk says he thinks we'll need four sockets. Two services # (koschei-resolver and koschei-polling) are only sending messages, one # service (koschei-watcher) can both send and receive them. The wsgi # webapp doesn't use fedmsg at all and all services are single-threaded + # koschei-watcher uses two endpoints "koschei.koschei01": [ "tcp://koschei01.%s:30%02i" % (suffix, i) - for i in range(3) + for i in range(4) ], # koji is not listed here since it publishes to the fedmsg-relay