From 20b6ff52b15aaabc303c26e7ac1c64621dc2fe36 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Mon, 16 Jun 2014 18:47:15 +0000
Subject: [PATCH] Add endpoints and fedmsg cert declarations for github2fedmsg
 and kerneltest.

---
 roles/fedmsg/base/tasks/main.yml              |  2 ++
 .../templates/endpoints-github2fedmsg.py.j2   | 14 +++++++++++++
 .../base/templates/endpoints-kerneltest.py.j2 | 20 +++++++++++++++++++
 roles/fedmsg/base/templates/ssl.py.j2         | 12 +++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 roles/fedmsg/base/templates/endpoints-github2fedmsg.py.j2
 create mode 100644 roles/fedmsg/base/templates/endpoints-kerneltest.py.j2

diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml
index 08fea66041..aa132c0d02 100644
--- a/roles/fedmsg/base/tasks/main.yml
+++ b/roles/fedmsg/base/tasks/main.yml
@@ -40,6 +40,8 @@
   - endpoints-nuancier.py
   - endpoints-mailman.py
   - endpoints-summershum.py
+  - endpoints-kerneltest.py
+  - endpoints-github2fedmsg.py
   - relay.py
   - pkgdb.py
   - logging.py
diff --git a/roles/fedmsg/base/templates/endpoints-github2fedmsg.py.j2 b/roles/fedmsg/base/templates/endpoints-github2fedmsg.py.j2
new file mode 100644
index 0000000000..d821d3701e
--- /dev/null
+++ b/roles/fedmsg/base/templates/endpoints-github2fedmsg.py.j2
@@ -0,0 +1,14 @@
+{% if env == 'staging' %}
+suffix  = 'stg.phx2.fedoraproject.org'
+{% else %}
+suffix = 'phx2.fedoraproject.org'
+{% endif %}
+
+config = dict(
+    endpoints={
+        "github2fedmsg.github2fedmsg01": [
+            "tcp://github2fedmsg01.%s:30%02i" % (suffix, i)
+            for i in range(16)
+        ],
+    },
+)
diff --git a/roles/fedmsg/base/templates/endpoints-kerneltest.py.j2 b/roles/fedmsg/base/templates/endpoints-kerneltest.py.j2
new file mode 100644
index 0000000000..053c19a28a
--- /dev/null
+++ b/roles/fedmsg/base/templates/endpoints-kerneltest.py.j2
@@ -0,0 +1,20 @@
+{% if env == 'staging' %}
+suffix  = 'stg.phx2.fedoraproject.org'
+{% else %}
+suffix = 'phx2.fedoraproject.org'
+{% endif %}
+
+config = dict(
+    endpoints={
+        "frontend.kerneltest01": [
+            "tcp://kerneltest01.%s:30%02i" % (suffix, i)
+            for i in range(16)
+        ],
+{% if env != 'staging' %}
+        "frontend.kerneltest02": [
+            "tcp://kerneltest02.%s:30%02i" % (suffix, i)
+            for i in range(16)
+        ],
+{% endif %}
+    },
+)
diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2
index 8000d3a2fc..1a88f56701 100644
--- a/roles/fedmsg/base/templates/ssl.py.j2
+++ b/roles/fedmsg/base/templates/ssl.py.j2
@@ -25,6 +25,18 @@ config = dict(
 
     certnames=dict(
     [
+        ("github2fedmsg.github2fedmsg0%i" % i, "github2fedmsg-github2fedmsg0%i.%s" % (i, suffix))
+        for i in range(1, 3)
+    ] + [
+        ("shell.github2fedmsg0%i" % i, "shell-github2fedmsg0%i.%s" % (i, suffix))
+        for i in range(1, 3)
+    ] + [
+        ("frontend.kerneltest0%i" % i, "frontend-kerneltest0%i.%s" % (i, suffix))
+        for i in range(1, 3)
+    ] + [
+        ("shell.kerneltest0%i" % i, "shell-kerneltest0%i.%s" % (i, suffix))
+        for i in range(1, 3)
+    ] + [
         ("shell.notifs-web0%i" % i, "shell-notifs-web0%i.%s" % (i, suffix))
         for i in range(1, 3)
     ] + [