From afbe9406dcc10005899af74cfc43b3a143aa2d23 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Wed, 14 May 2014 15:54:30 +0000
Subject: [PATCH] pkgdb2 fedmsg config.

---
 roles/fedmsg/base/templates/pkgdb.py.j2  | 28 ++++--------------------
 roles/fedmsg/base/templates/policy.py.j2 | 24 +++++++-------------
 2 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/roles/fedmsg/base/templates/pkgdb.py.j2 b/roles/fedmsg/base/templates/pkgdb.py.j2
index cef1d8fe0e..fcdd9149f3 100644
--- a/roles/fedmsg/base/templates/pkgdb.py.j2
+++ b/roles/fedmsg/base/templates/pkgdb.py.j2
@@ -8,33 +8,13 @@ non_phx_suffix = 'fedoraproject.org'
 
 config = dict(
     endpoints={
-        "pkgdb.app01": [
-            "tcp://app01.%s:301%i" % (suffix, i)
-            for i in range(10)
-        ],
-        "pkgdb.app02": [
-            "tcp://app02.%s:301%i" % (suffix, i)
+        "pkgdb.pkgdb01": [
+            "tcp://pkgdb01.%s:301%i" % (suffix, i)
             for i in range(10)
         ],
 {% if not env == 'staging' %}
-        "pkgdb.app03": [
-            "tcp://app03.%s:301%i" % (suffix, i)
-            for i in range(10)
-        ],
-        "pkgdb.app04": [
-            "tcp://app04.%s:301%i" % (suffix, i)
-            for i in range(10)
-        ],
-        "pkgdb.app05": [
-            "tcp://app05.%s:301%i" % (non_phx_suffix, i)
-            for i in range(10)
-        ],
-        "pkgdb.app07": [
-            "tcp://app07.%s:301%i" % (suffix, i)
-            for i in range(10)
-        ],
-        "pkgdb.app08": [
-            "tcp://app08.%s:301%i" % (non_phx_suffix, i)
+        "pkgdb.pkgdb02": [
+            "tcp://pkgdb02.%s:301%i" % (suffix, i)
             for i in range(10)
         ],
 {% endif %}
diff --git a/roles/fedmsg/base/templates/policy.py.j2 b/roles/fedmsg/base/templates/policy.py.j2
index 33a23aec54..17ed9b41a7 100644
--- a/roles/fedmsg/base/templates/policy.py.j2
+++ b/roles/fedmsg/base/templates/policy.py.j2
@@ -200,36 +200,28 @@ config = dict(
 
         # Pkgdb messages
         topic_prefix + "pkgdb.acl.update": [
-            "pkgdb-%s" % app_hosts[i-1]
-            for i in range(1, len(app_hosts) + 1)
+            "pkgdb-pkgdb0%i.%s" % (i, suffix) for i in range(1, 3)
         ],
         topic_prefix + "pkgdb.acl.request.toggle": [
-            "pkgdb-%s" % app_hosts[i-1]
-            for i in range(1, len(app_hosts) + 1)
+            "pkgdb-pkgdb0%i.%s" % (i, suffix) for i in range(1, 3)
         ],
         topic_prefix + "pkgdb.acl.user.remove": [
-            "pkgdb-%s" % app_hosts[i-1]
-            for i in range(1, len(app_hosts) + 1)
+            "pkgdb-pkgdb0%i.%s" % (i, suffix) for i in range(1, 3)
         ],
         topic_prefix + "pkgdb.owner.update": [
-            "pkgdb-%s" % app_hosts[i-1]
-            for i in range(1, len(app_hosts) + 1)
+            "pkgdb-pkgdb0%i.%s" % (i, suffix) for i in range(1, 3)
         ],
         topic_prefix + "pkgdb.package.new": [
-            "pkgdb-%s" % app_hosts[i-1]
-            for i in range(1, len(app_hosts) + 1)
+            "pkgdb-pkgdb0%i.%s" % (i, suffix) for i in range(1, 3)
         ],
         topic_prefix + "pkgdb.package.update": [
-            "pkgdb-%s" % app_hosts[i-1]
-            for i in range(1, len(app_hosts) + 1)
+            "pkgdb-pkgdb0%i.%s" % (i, suffix) for i in range(1, 3)
         ],
         topic_prefix + "pkgdb.package.retire": [
-            "pkgdb-%s" % app_hosts[i-1]
-            for i in range(1, len(app_hosts) + 1)
+            "pkgdb-pkgdb0%i.%s" % (i, suffix) for i in range(1, 3)
         ],
         topic_prefix + "pkgdb.critpath.update": [
-            "pkgdb-%s" % app_hosts[i-1]
-            for i in range(1, len(app_hosts) + 1)
+            "pkgdb-pkgdb0%i.%s" % (i, suffix) for i in range(1, 3)
         ],
 
         # Planet/venus