From f5aca677c365cd6d81ee18bb5b76d2dc8822b89d Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 26 Sep 2018 15:28:41 -0400 Subject: [PATCH] Link the cert and key to where fedmsg looks for them Signed-off-by: Jeremy Cline --- roles/openshift-apps/release-monitoring/files/buildconfig.yml | 4 ++++ .../openshift-apps/release-monitoring/templates/configmap.yml | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/openshift-apps/release-monitoring/files/buildconfig.yml b/roles/openshift-apps/release-monitoring/files/buildconfig.yml index c7bfadfb8d..22ea47de45 100644 --- a/roles/openshift-apps/release-monitoring/files/buildconfig.yml +++ b/roles/openshift-apps/release-monitoring/files/buildconfig.yml @@ -51,6 +51,10 @@ items: pip-3 install . && \ popd && \ rm -rf anitya + RUN rm /etc/fedmsg.d/*py + RUN mkdir -p /etc/pki/fedmsg/ + RUN ln -sf /etc/pki/fedmsg/key/fedmsg-release-monitoring.key /etc/pki/fedmsg/release-monitoring.key + RUN ln -sf /etc/pki/fedmsg/crt/fedmsg-release-monitoring.crt /etc/pki/fedmsg/release-monitoring.crt ENV USER=anitya EXPOSE 8080 EXPOSE 9940 diff --git a/roles/openshift-apps/release-monitoring/templates/configmap.yml b/roles/openshift-apps/release-monitoring/templates/configmap.yml index 9d9ba2141b..a0c2a63ed7 100644 --- a/roles/openshift-apps/release-monitoring/templates/configmap.yml +++ b/roles/openshift-apps/release-monitoring/templates/configmap.yml @@ -150,14 +150,12 @@ items: "ssldir": "/etc/pki/fedmsg/", "cert_prefix": "release-monitoring", "certnames": {"anitya.{}".format(socket.gethostname()): "release-monitoring"}, + "endpoints": {}, {% 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']}, {% else %} "environment": "prod", "relay_inbound": ["tcp://busgateway01.phx2.fedoraproject.org:9941"], - "endpoints": {"production_gateway": ['tcp://fedoraproject.org:9940']}, {% endif %} }