From 949615fa8a62173feed967bc53fdf9d39d1124e6 Mon Sep 17 00:00:00 2001
From: Chenxiong Qi <cqi@redhat.com>
Date: Fri, 26 Jul 2019 15:12:42 +0800
Subject: [PATCH] message-tagging-service: fix configmap and DC

Signed-off-by: Chenxiong Qi <cqi@redhat.com>
---
 .../message-tagging-service/templates/configmap.yml       | 8 +++++---
 .../message-tagging-service/templates/deployment.yml      | 7 +++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/roles/openshift-apps/message-tagging-service/templates/configmap.yml b/roles/openshift-apps/message-tagging-service/templates/configmap.yml
index 826486be34..e316878927 100644
--- a/roles/openshift-apps/message-tagging-service/templates/configmap.yml
+++ b/roles/openshift-apps/message-tagging-service/templates/configmap.yml
@@ -6,15 +6,16 @@ metadata:
   labels:
     app: "{{ app }}"
 data:
-  app_config.py: |-
+  config.py: |-
     class BaseConfiguration:
-        # Set this to False when MTS is ready to work on either stg or prod
+        # FIXME: Set this to False when MTS is ready to work on either stg or prod
         dry_run = True
 
+        log_level = 'DEBUG'
+
         keytab = '/etc/krb5.keytab'
         principal = '{{ app }}/{{ app }}{{ env_suffix }}.fedoraproject.org@{{ ipa_realm }}'
 
-        log_level = 'INFO'
         messaging_backend = 'fedmsg'
         messaging_backends = {
             'fedmsg': {'service': 'mts'},
@@ -47,6 +48,7 @@ metadata:
 data:
   mts.py: |-
     config = {
+        'zmq_enabled': True,
         'mts-consumer': True,
         'validate_signatures': False,
         'active': True,
diff --git a/roles/openshift-apps/message-tagging-service/templates/deployment.yml b/roles/openshift-apps/message-tagging-service/templates/deployment.yml
index f9f7bd18d4..4582fc9b57 100644
--- a/roles/openshift-apps/message-tagging-service/templates/deployment.yml
+++ b/roles/openshift-apps/message-tagging-service/templates/deployment.yml
@@ -18,6 +18,7 @@ spec:
     spec:
       containers:
       - name: "{{ app }}"
+        image: "quay.io/factory2/{{ app }}:{{ quay_tag }}"
         ports:
         - containerPort: 8080
         volumeMounts:
@@ -51,6 +52,12 @@ spec:
             path: /
             port: 8080
       volumes:
+      - name: "{{ app }}-config"
+        configMap:
+          name: "{{ app }}-config"
+      - name: "{{ app }}-fedmsg"
+        configMap:
+          name: "{{ app }}-fedmsg"
       - name: keytab
         secret:
           secretName: keytab