Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Link the cert and key to where fedmsg looks for them

Browse source 
Signed-off-by: Jeremy Cline <jcline@redhat.com>
This commit is contained in:
Jeremy Cline 2018-09-26 15:28:41 -04:00 • committed by Jeremy Cline
parent b687217f9f
commit f5aca677c3
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/openshift-apps/release-monitoring/files/buildconfig.yml
View file

@ -51,6 +51,10 @@ items:
pip-3 install . && \ pip-3 install . && \
popd && \ popd && \
rm -rf anitya 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 ENV USER=anitya
EXPOSE 8080 EXPOSE 8080
EXPOSE 9940 EXPOSE 9940

4
roles/openshift-apps/release-monitoring/templates/configmap.yml
View file

@ -150,14 +150,12 @@ items:
"ssldir": "/etc/pki/fedmsg/", "ssldir": "/etc/pki/fedmsg/",
"cert_prefix": "release-monitoring", "cert_prefix": "release-monitoring",
"certnames": {"anitya.{}".format(socket.gethostname()): "release-monitoring"}, "certnames": {"anitya.{}".format(socket.gethostname()): "release-monitoring"},
"endpoints": {},
{% if env == 'staging' %} {% if env == 'staging' %}
"environment": "stg", "environment": "stg",
"relay_inbound": ["tcp://busgateway01.stg.phx2.fedoraproject.org:9941"], "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 %} {% else %}
"environment": "prod", "environment": "prod",
"relay_inbound": ["tcp://busgateway01.phx2.fedoraproject.org:9941"], "relay_inbound": ["tcp://busgateway01.phx2.fedoraproject.org:9941"],
"endpoints": {"production_gateway": ['tcp://fedoraproject.org:9940']},
{% endif %} {% endif %}
} }