From 09d5e878e5797cd10c4592d67c1fcca140d33e40 Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jeremy@jcline.org>
Date: Tue, 25 Sep 2018 20:07:54 +0000
Subject: [PATCH] Try to convince fedmsg to find the certs

Make use of some crazy undocumented settings to see if fedmsg will do
something remotely normal.

Signed-off-by: Jeremy Cline <jeremy@jcline.org>
---
 .../release-monitoring/templates/configmap.yml             | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/roles/openshift-apps/release-monitoring/templates/configmap.yml b/roles/openshift-apps/release-monitoring/templates/configmap.yml
index 175b2aaf9d..8ffadabcf8 100644
--- a/roles/openshift-apps/release-monitoring/templates/configmap.yml
+++ b/roles/openshift-apps/release-monitoring/templates/configmap.yml
@@ -147,18 +147,19 @@ items:
           "validate_signatures": True,
           "crypto_backend": "x509",
           "ssldir": "/etc/pki/fedmsg/",
-          "certnames": {
-              "release-monitoring." + socket.gethostname(): "release-monitoring",
-          },
           "topic_prefix": "org.release-monitoring",
 {% if env == 'staging' %}
           "environment": "stg",
           "relay_inbound": ["tcp://busgateway01.stg.phx2.fedoraproject.org:9941"],
           # Pointless because we don't listen for anything, but fedmsg explodes without it
           "endpoints": {"staging_gateway": ['tcp://stg.fedoraproject.org:9940']},
+          "name": "stg-release-monitoring",
+          "certnames": {"stg-release-monitoring": "release-monitoring.stg.release-monitoring.org"},
 {% else %}
           "environment": "prod",
           "relay_inbound": ["tcp://busgateway01.phx2.fedoraproject.org:9941"],
           "endpoints": {"production_gateway": ['tcp://fedoraproject.org:9940']},
+          "name": "release-monitoring",
+          "certnames": {"release-monitoring": "release-monitoring.release-monitoring.org"},
 {% endif %}
       }