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

Add new config for fedmsg consumer

Browse source
This commit is contained in:
Michal Konečný 2018-11-29 19:14:08 +01:00
parent 5ead8fbd49
commit 2845173c2b
2 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/openshift-apps/release-monitoring/files/deploymentconfig.yml
View file

@ -157,7 +157,7 @@ items:
name: release-monitoring-configmap name: release-monitoring-configmap
- name: fedmsg-config-volume - name: fedmsg-config-volume
configMap: configMap:
name: fedmsg-configmap name: fedmsg-consumer-configmap
- name: fedmsg-key-volume - name: fedmsg-key-volume
secret: secret:
secretName: release-monitoring-fedmsg-key secretName: release-monitoring-fedmsg-key

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

@ -96,7 +96,7 @@ items:
handlers = ["console"] handlers = ["console"]
[anitya_log_config.loggers.fedmsg] [anitya_log_config.loggers.fedmsg]
level = "DEBUG" level = "INFO"
propagate = false propagate = false
handlers = ["console"] handlers = ["console"]
@ -228,18 +228,40 @@ items:
"topic_prefix": "org.release-monitoring", "topic_prefix": "org.release-monitoring",
"sign_messages": True, "sign_messages": True,
"validate_signatures": True, "validate_signatures": True,
"anitya.libraryio.enabled": True,
"crypto_backend": "x509", "crypto_backend": "x509",
"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"},
{% if env == 'staging' %} {% if env == 'staging' %}
"endpoints": {"anitya.stg": "tcp://busgateway01.stg.phx2.fedoraproject.org:9940"},
"environment": "stg", "environment": "stg",
"relay_inbound": ["tcp://busgateway01.stg.phx2.fedoraproject.org:9941"], "relay_inbound": ["tcp://busgateway01.stg.phx2.fedoraproject.org:9941"],
{% else %} {% else %}
"endpoints": {"anitya.prod": "tcp://busgateway01.phx2.fedoraproject.org:9940"},
"environment": "prod", "environment": "prod",
"relay_inbound": ["tcp://busgateway01.phx2.fedoraproject.org:9941"], "relay_inbound": ["tcp://busgateway01.phx2.fedoraproject.org:9941"],
{% endif %} {% endif %}
} }
- apiVersion: v1
kind: ConfigMap
metadata:
name: fedmsg-consumer-configmap
labels:
app: fedmsg-consumer
data:
anitya.py: |-
import socket
config = {
"zmq_enabled": True,
"topic_prefix": "org.fedoraproject",
"anitya.libraryio.enabled": True,
"crypto_backend": "x509",
"ssldir": "/etc/pki/fedmsg/",
"cert_prefix": "release-monitoring",
"certnames": {"anitya.{}".format(socket.gethostname()): "release-monitoring"},
{% if env == 'staging' %}
"endpoints": {"anitya.stg": "tcp://busgateway01.stg.phx2.fedoraproject.org:9940"},
"environment": "stg",
{% else %}
"endpoints": {"anitya.prod": "tcp://busgateway01.phx2.fedoraproject.org:9940"},
"environment": "prod",
{% endif %}
}