From d853ff6f60c32e22c7bf0b1aba00d04210e6a2ac Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Fri, 7 Mar 2014 21:38:41 +0000
Subject: [PATCH] fedmsg config changes for tagger on new nodes.

---
 roles/fedmsg_base/templates/endpoints.py.j2 | 15 ++++++++++++++-
 roles/fedmsg_base/templates/policy.py.j2    | 11 +++++++++++
 roles/fedmsg_base/templates/ssl.py.j2       |  8 ++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/roles/fedmsg_base/templates/endpoints.py.j2 b/roles/fedmsg_base/templates/endpoints.py.j2
index c9b837d0b4..f83e86f650 100644
--- a/roles/fedmsg_base/templates/endpoints.py.j2
+++ b/roles/fedmsg_base/templates/endpoints.py.j2
@@ -86,7 +86,8 @@ config = dict(
             for i in range(40)
         ],
 {% endif %}
-        # Well, fedoratagger needs 32 endpoints too, just like FAS.
+        # TODO -- these are the old tagger endpoints that should eventually be
+        # removed.
         "fedoratagger.packages01": [
             "tcp://packages01.%s:30%02i" % (suffix, i)
             for i in range(32)
@@ -96,6 +97,18 @@ config = dict(
             "tcp://packages02.%s:30%02i" % (suffix, i)
             for i in range(32)
         ],
+{% endif %}
+        # These are the new endpoints, on the new tagger01,2 nodes.
+        # fedoratagger needs 32 endpoints too, just like FAS.
+        "fedoratagger.tagger01": [
+            "tcp://tagger01.%s:30%02i" % (suffix, i)
+            for i in range(32)
+        ],
+{% if env != 'staging' %}
+        "fedoratagger.tagger02": [
+            "tcp://tagger02.%s:30%02i" % (suffix, i)
+            for i in range(32)
+        ],
 {% endif %}
         "busmon_consumers.busgateway01": [
             "tcp://busgateway01.%s:3000" % suffix,
diff --git a/roles/fedmsg_base/templates/policy.py.j2 b/roles/fedmsg_base/templates/policy.py.j2
index 4a23dbaf03..18b38516ec 100644
--- a/roles/fedmsg_base/templates/policy.py.j2
+++ b/roles/fedmsg_base/templates/policy.py.j2
@@ -172,6 +172,17 @@ config = dict(
         ],
 
         # Tagger messages
+        topic_prefix + "fedoratagger.tag.update": [
+            "fedoratagger-tagger0%i.%s" % (i, suffix) for i in range(1, 3)
+        ],
+        topic_prefix + "fedoratagger.tag.create": [
+            "fedoratagger-tagger0%i.%s" % (i, suffix) for i in range(1, 3)
+        ],
+        topic_prefix + "fedoratagger.user.rank.update": [
+            "fedoratagger-tagger0%i.%s" % (i, suffix) for i in range(1, 3)
+        ],
+
+        # TODO -- delete these once we retired tagger off of packages01,2
         topic_prefix + "fedoratagger.tag.update": [
             "fedoratagger-packages0%i.%s" % (i, suffix) for i in range(1, 3)
         ],
diff --git a/roles/fedmsg_base/templates/ssl.py.j2 b/roles/fedmsg_base/templates/ssl.py.j2
index 24054673cd..b43934f810 100644
--- a/roles/fedmsg_base/templates/ssl.py.j2
+++ b/roles/fedmsg_base/templates/ssl.py.j2
@@ -54,8 +54,16 @@ config = dict(
         ("shell.packages0%i" % i, "shell-packages0%i.%s" % (i, suffix))
         for i in range(1, 3)
     ] + [
+        # TODO -- this one can be delete eventually once we retired tagger off
+        # of packages01,2
         ("fedoratagger.packages0%i" % i, "fedoratagger-packages0%i.%s" % (i, suffix))
         for i in range(1, 3)
+    ] + [
+        ("fedoratagger.tagger0%i" % i, "fedoratagger-tagger0%i.%s" % (i, suffix))
+        for i in range(1, 3)
+    ] + [
+        ("shell.tagger0%i" % i, "shell-tagger0%i.%s" % (i, suffix))
+        for i in range(1, 3)
     ] + [
         ("shell.pkgs0%i" % i, "shell-pkgs0%i.%s" % (i, suffix))
         for i in range(1, 2)