From ede8eadc237b8ebd157684b05871a32fb900aa14 Mon Sep 17 00:00:00 2001
From: Chenxiong Qi <cqi@redhat.com>
Date: Thu, 5 Sep 2019 15:46:11 +0800
Subject: [PATCH] message-tagging-service: connect to fedora-messaging instead
 of fedmsg

Signed-off-by: Chenxiong Qi <cqi@redhat.com>
---
 .../templates/config.toml                     | 70 +++++++++++++++++++
 .../templates/configmap.yml                   | 59 +---------------
 .../templates/deployment.yml                  |  5 +-
 3 files changed, 76 insertions(+), 58 deletions(-)
 create mode 100644 roles/openshift-apps/message-tagging-service/templates/config.toml

diff --git a/roles/openshift-apps/message-tagging-service/templates/config.toml b/roles/openshift-apps/message-tagging-service/templates/config.toml
new file mode 100644
index 0000000000..862a6a7130
--- /dev/null
+++ b/roles/openshift-apps/message-tagging-service/templates/config.toml
@@ -0,0 +1,70 @@
+amqp_url = "amqps://message-tagging-service{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
+
+{% if env == "staging" %}
+topic_prefix = "org.fedoraproject.stg"
+{% else %}
+topic_prefix = "org.fedoraproject.prod"
+{% endif %}
+
+[tls]
+ca_cert = "/etc/pki/tls/certs/ca-bundle.crt"
+keyfile = "{{private}}/files/rabbitmq/{{env}}/pki/private/mts{{ env_suffix }}.key"
+certfile = "{{private}}/files/rabbitmq/{{env}}/pki/issued/mts{{ env_suffix }}.crt"
+
+
+[client_properties]
+app = "Message Tagging Service"
+app_url = "https://github.com/fedora-modularity/message-tagging-service"
+app_contacts_email = ["cqi@redhat.com"]
+
+[exchanges."amq.topic"]
+type = "topic"
+durable = true
+auto_delete = false
+arguments = {}
+
+[queues.5de78c42-8f70-4e0b-bc0c-efa1dd4f13ad]
+durable = true
+auto_delete = false
+exclusive = false
+arguments = {}
+
+[[bindings]]
+queue = "5de78c42-8f70-4e0b-bc0c-efa1dd4f13ad"
+exchange = "amq.topic"
+routing_keys = ["org.fedoraproject.*.mbs.build.state.change"]
+
+[qos]
+prefetch_size = 0
+prefetch_count = 25
+
+[log_config]
+version = 1
+disable_existing_loggers = true
+
+[log_config.formatters.simple]
+format = "[%(levelname)s %(name)s] %(message)s"
+
+[log_config.handlers.console]
+class = "logging.StreamHandler"
+formatter = "simple"
+stream = "ext://sys.stdout"
+
+[log_config.loggers.fedora_messaging]
+level = "INFO"
+propagate = false
+handlers = ["console"]
+
+[log_config.loggers.twisted]
+level = "INFO"
+propagate = false
+handlers = ["console"]
+
+[log_config.loggers.pika]
+level = "WARNING"
+propagate = false
+handlers = ["console"]
+
+[log_config.root]
+level = "ERROR"
+handlers = ["console"]
diff --git a/roles/openshift-apps/message-tagging-service/templates/configmap.yml b/roles/openshift-apps/message-tagging-service/templates/configmap.yml
index c56ae22a3e..0c039d34e8 100644
--- a/roles/openshift-apps/message-tagging-service/templates/configmap.yml
+++ b/roles/openshift-apps/message-tagging-service/templates/configmap.yml
@@ -48,65 +48,12 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "mts-fedmsg"
+  name: "mts-fedora-messaging"
   labels:
     app: "mts"
 data:
-  mts.py: |-
-    config = {
-        'zmq_enabled': True,
-        'mts-consumer': True,
-        'validate_signatures': False,
-        'active': True,
-
-        {% if env == 'staging' %}
-
-        'environment': 'stg',
-        'endpoints': {
-            'fedora-infrastructure': ['tcp://stg.fedoraproject.org:9940'],
-            'relay_outbound': ['tcp://busgateway01.stg.phx2.fedoraproject.org:3999'],
-        },
-        'relay_inbound': ['tcp://busgateway01.stg.phx2.fedoraproject.org:9941'],
-
-        {% else %}
-
-        'environment': 'prod',
-        'endpoints': {
-            'fedora-infrastructure': ['tcp://hub.fedoraproject.org:9940'],
-            'relay_outbound': ['tcp://busgateway01.phx2.fedoraproject.org:3999'],
-        },
-        'relay_inbound': ['tcp://busgateway01.phx2.fedoraproject.org:9941'],
-
-        {% endif %}
-    }
-  logging.py: |-
-    config = dict(logging={
-        "version": 1,
-        "formatters": {
-            "bare": {
-                "datefmt": "%Y-%m-%d %H:%M:%S",
-                "format": "[%(asctime)s][%(name)10s %(levelname)7s] %(message)s"
-            }
-        },
-        "loggers": {
-            "message_tagging_service": {
-                "handlers": ["console"], "propagate": False, "level": "DEBUG"},
-            "fedmsg": {
-                "handlers": ["console"], "propagate": False, "level": "DEBUG"},
-            "moksha": {
-                "handlers": ["console"], "propagate": False, "level": "DEBUG"},
-            "koji": {
-                "handlers": ["console"], "propagate": False, "level": "DEBUG"},
-        },
-        "handlers": {
-            "console": {
-                "formatter": "bare",
-                "class": "logging.StreamHandler",
-                "stream": "ext://sys.stdout",
-                "level": "DEBUG"
-            }
-        },
-    })
+  config.toml: |-
+    {{ load_file('config.toml') | indent }}
 
 ---
 apiVersion: v1
diff --git a/roles/openshift-apps/message-tagging-service/templates/deployment.yml b/roles/openshift-apps/message-tagging-service/templates/deployment.yml
index 191b23024e..fa5ddd34c0 100644
--- a/roles/openshift-apps/message-tagging-service/templates/deployment.yml
+++ b/roles/openshift-apps/message-tagging-service/templates/deployment.yml
@@ -39,8 +39,9 @@ spec:
         - name: "mts-config"
           mountPath: /etc/mts
           readOnly: true
-        - name: "mts-fedmsg"
-          mountPath: /etc/fedmsg.d
+        - name: "mts-fedora-messaging"
+          mountPath: /etc/fedora-messaging/config.toml
+          subPath: config.toml
           readOnly: true
         - name: "koji-conf"
 {% if env == 'staging' %}