diff --git a/inventory/group_vars/koschei b/inventory/group_vars/koschei index b09afc6e9d..66a7526f31 100644 --- a/inventory/group_vars/koschei +++ b/inventory/group_vars/koschei @@ -18,9 +18,8 @@ koschei_bugzilla: bugzilla.redhat.com tcp_ports: [ 80, 443, - # These 9 are for fedmsg right now, but we need to check with the koschei - # devs if this is enough or too much. See also /etc/fedmsg.d/endpoints.py - 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, + # These 3 are for fedmsg. See also /etc/fedmsg.d/endpoints.py + 3000, 3001, 3002, ] custom_rules: [ diff --git a/inventory/group_vars/koschei-stg b/inventory/group_vars/koschei-stg index a6e0e193c0..956ffb15ff 100644 --- a/inventory/group_vars/koschei-stg +++ b/inventory/group_vars/koschei-stg @@ -18,9 +18,8 @@ koschei_bugzilla: partner-bugzilla.redhat.com tcp_ports: [ 80, 443, - # These 9 are for fedmsg right now, but we need to check with the koschei - # devs if this is enough or too much. See also /etc/fedmsg.d/endpoints.py - 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, + # These 3 are for fedmsg. See also /etc/fedmsg.d/endpoints.py + 3000, 3001, 3002, ] custom_rules: [ diff --git a/roles/fedmsg/base/templates/endpoints.py.j2 b/roles/fedmsg/base/templates/endpoints.py.j2 index 787c7fc9cc..c4ad687e99 100644 --- a/roles/fedmsg/base/templates/endpoints.py.j2 +++ b/roles/fedmsg/base/templates/endpoints.py.j2 @@ -89,14 +89,13 @@ config = dict( for i in range(2) ], - # I'm not sure how many endpoints koschei needs. There are four backend - # processes.. i'm not sure how many of them publish messages and how - # many threads each of them might have. And there's a wsgi frontend - # with 5 threads, but I don't think it publishes any messages. - # TODO -- update this after talking with the koschei devs. + # mizdebsk says he thinks we'll need three 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.koschei01": [ "tcp://koschei01.%s:30%02i" % (suffix, i) - for i in range(9) + for i in range(3) ], # koji is not listed here since it publishes to the fedmsg-relay