From 4d0f14ab5af681e87106e6b9a23c905ececad4a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= Date: Wed, 22 May 2019 16:33:40 +0200 Subject: [PATCH] Release-monitoring: Remove fedmsg-hub related configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Konečný --- .../release-monitoring/files/imagestream.yml | 6 ---- .../templates/configmap.yml | 30 ------------------- 2 files changed, 36 deletions(-) diff --git a/roles/openshift-apps/release-monitoring/files/imagestream.yml b/roles/openshift-apps/release-monitoring/files/imagestream.yml index f09d401176..44856d1c34 100644 --- a/roles/openshift-apps/release-monitoring/files/imagestream.yml +++ b/roles/openshift-apps/release-monitoring/files/imagestream.yml @@ -6,11 +6,5 @@ items: name: release-monitoring-web labels: build: release-monitoring-web -- apiVersion: v1 - kind: ImageStream - metadata: - name: fedmsg-hub - labels: - build: fedmsg-hub kind: List metadata: {} diff --git a/roles/openshift-apps/release-monitoring/templates/configmap.yml b/roles/openshift-apps/release-monitoring/templates/configmap.yml index c6e8737cd0..77850877c1 100644 --- a/roles/openshift-apps/release-monitoring/templates/configmap.yml +++ b/roles/openshift-apps/release-monitoring/templates/configmap.yml @@ -234,33 +234,3 @@ items: ca_cert = "/etc/pki/rabbitmq/ca/fedora-messaging-release-monitoring-ca.crt" keyfile = "/etc/pki/rabbitmq/key/fedora-messaging-release-monitoring.key" certfile = "/etc/pki/rabbitmq/cert/fedora-messaging-release-monitoring.crt" -- apiVersion: v1 - kind: ConfigMap - metadata: - name: fedmsg-consumer-configmap - labels: - app: release-monitoring - data: - anitya.py: |- - import socket - config = { - "zmq_enabled": True, - "active": True, - "topic_prefix": "org.fedoraproject", - "sign_messages": True, - "validate_signatures": True, - "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", - "relay_inbound": ["tcp://busgateway01.stg.phx2.fedoraproject.org:9941"], -{% else %} - "endpoints": {"anitya.prod": "tcp://busgateway01.phx2.fedoraproject.org:9940"}, - "environment": "prod", - "relay_inbound": ["tcp://busgateway01.phx2.fedoraproject.org:9941"], -{% endif %} - }