From 2cda638026088422c7079c3a55bef8c0fa912b48 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Thu, 19 Nov 2015 14:40:27 +0000
Subject: [PATCH] Give mailman3 more fedmsg endpoints.

---
 inventory/group_vars/mailman                        |  6 +++++-
 inventory/group_vars/mailman-stg                    |  6 +++++-
 roles/fedmsg/base/templates/endpoints-mailman.py.j2 | 11 +++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/inventory/group_vars/mailman b/inventory/group_vars/mailman
index 0c20a5d55b..ea870086b6 100644
--- a/inventory/group_vars/mailman
+++ b/inventory/group_vars/mailman
@@ -6,7 +6,11 @@ num_cpus: 4
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 
-tcp_ports: [ 25, 80, 443, 3000, 3001 ]
+tcp_ports: [
+    25, 80, 443,
+    # For outgoing fedmsg
+    3000, 3001, 3002, 3003,
+]
 
 fas_client_groups: sysadmin-tools,sysadmin-main
 
diff --git a/inventory/group_vars/mailman-stg b/inventory/group_vars/mailman-stg
index c08829d28d..70426e4891 100644
--- a/inventory/group_vars/mailman-stg
+++ b/inventory/group_vars/mailman-stg
@@ -6,7 +6,11 @@ num_cpus: 2
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 
-tcp_ports: [ 25, 80, 443, 3000, 3001 ]
+tcp_ports: [
+    25, 80, 443,
+    # For outbound fedmsg
+    3000, 3001, 3002, 3003,
+]
 fas_client_groups: sysadmin-tools,sysadmin-main
 
 # These are consumed by a task in roles/fedmsg/base/main.yml
diff --git a/roles/fedmsg/base/templates/endpoints-mailman.py.j2 b/roles/fedmsg/base/templates/endpoints-mailman.py.j2
index f7ba0d3321..88e09f3e33 100644
--- a/roles/fedmsg/base/templates/endpoints-mailman.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-mailman.py.j2
@@ -11,6 +11,17 @@ config = dict(
         "mailman.mailman01": [
             "tcp://mailman01.%s:3000" % suffix,
             "tcp://mailman01.%s:3001" % suffix,
+
+            # On Nov 19th, we started getting tracebacks that mailman3 had run
+            # out of endpoints.  We're not sure what changed that required
+            # additional entries here, but we're adding them to try and make the
+            # error go away.
+            # One idea is that the mailman REST server grew the ability to list
+            # the archivers.  Postorius calls that, and it (under the hood)
+            # tries to initialize all the archivers, which would inadvertently
+            # try to force our fedmsg plugin to establish a socket.
+            "tcp://mailman01.%s:3002" % suffix,
+            "tcp://mailman01.%s:3003" % suffix,
         ],
     },
 )