From 5177fc674f72c617bf69f72f5b10340c5ef3950d Mon Sep 17 00:00:00 2001
From: Chenxiong Qi <cqi@redhat.com>
Date: Mon, 15 Jul 2019 14:56:02 +0800
Subject: [PATCH] message-tagging-service: apply config in playbook

In addition, app_name is removed and all name app_name are replaced with
default variable app. This change makes message-tagging-service behave
the same way like other services.
---
 playbooks/openshift-apps/message-tagging-service.yml   |  2 ++
 .../message-tagging-service/templates/configmap.yml    |  8 ++++----
 .../message-tagging-service/templates/deployment.yml   | 10 +++++-----
 .../message-tagging-service/templates/imagestream.yml  |  8 ++++----
 .../message-tagging-service/vars/main.yml              |  1 -
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/playbooks/openshift-apps/message-tagging-service.yml b/playbooks/openshift-apps/message-tagging-service.yml
index d0b71f1253..5a1835803d 100644
--- a/playbooks/openshift-apps/message-tagging-service.yml
+++ b/playbooks/openshift-apps/message-tagging-service.yml
@@ -32,5 +32,7 @@
         template: "{{ item }}.yml"
         objectname: "{{ item }}.yml"
       with_items:
+        - configmap
+        - imagestream
         - deployment
         - service
diff --git a/roles/openshift-apps/message-tagging-service/templates/configmap.yml b/roles/openshift-apps/message-tagging-service/templates/configmap.yml
index 5c0adb3252..826486be34 100644
--- a/roles/openshift-apps/message-tagging-service/templates/configmap.yml
+++ b/roles/openshift-apps/message-tagging-service/templates/configmap.yml
@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "{{ app_name }}-config"
+  name: "{{ app }}-config"
   labels:
-    app: "{{ app_name }}"
+    app: "{{ app }}"
 data:
   app_config.py: |-
     class BaseConfiguration:
@@ -12,7 +12,7 @@ data:
         dry_run = True
 
         keytab = '/etc/krb5.keytab'
-        principal = '{{ app_name }}/{{ app_name }}{{ env_suffix }}.fedoraproject.org@{{ ipa_realm }}'
+        principal = '{{ app }}/{{ app }}{{ env_suffix }}.fedoraproject.org@{{ ipa_realm }}'
 
         log_level = 'INFO'
         messaging_backend = 'fedmsg'
@@ -43,7 +43,7 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "{{ app_name }}-fedmsg"
+  name: "{{ app }}-fedmsg"
 data:
   mts.py: |-
     config = {
diff --git a/roles/openshift-apps/message-tagging-service/templates/deployment.yml b/roles/openshift-apps/message-tagging-service/templates/deployment.yml
index bf2a2d7a47..f9f7bd18d4 100644
--- a/roles/openshift-apps/message-tagging-service/templates/deployment.yml
+++ b/roles/openshift-apps/message-tagging-service/templates/deployment.yml
@@ -17,14 +17,14 @@ spec:
         service: mts
     spec:
       containers:
-      - name: "{{ app_name }}"
+      - name: "{{ app }}"
         ports:
         - containerPort: 8080
         volumeMounts:
-        - name: "{{ app_name }}-config"
+        - name: "{{ app }}-config"
           mountPath: /etc/mts
           readOnly: true
-        - name: "{{ app_name }}"-fedmsg
+        - name: "{{ app }}"-fedmsg
           mountPath: /etc/fedmsg.d
           readOnly: true
         - name: keytab
@@ -60,7 +60,7 @@ spec:
         imageChangeParams:
           automatic: true
           containerNames:
-          - "{{ app_name }}"
+          - "{{ app }}"
           from:
             kind: ImageStreamTag
-            name: "{{ app_name }}:latest"
+            name: "{{ app }}:latest"
diff --git a/roles/openshift-apps/message-tagging-service/templates/imagestream.yml b/roles/openshift-apps/message-tagging-service/templates/imagestream.yml
index 59ad0a632d..6dfc7e8a32 100644
--- a/roles/openshift-apps/message-tagging-service/templates/imagestream.yml
+++ b/roles/openshift-apps/message-tagging-service/templates/imagestream.yml
@@ -1,18 +1,18 @@
 apiVersion: v1
 kind: ImageStream
 metadata:
-  name: "{{ app_name }}"
+  name: "{{ app }}"
   labels:
-    app: "{{ app_name }}"
+    app: "{{ app }}"
 spec:
   tags:
   - name: latest
     from:
       kind: DockerImage
 {% if env == 'staging' %}
-      name: "quay.io/factory2/{{ app_name }}:stage"
+      name: "quay.io/factory2/{{ app }}:stage"
 {% else %}
-      name: "quay.io/factory2/{{ app_name }}:prod"
+      name: "quay.io/factory2/{{ app }}:prod"
 {% endif %}
     importPolicy:
       scheduled: true
diff --git a/roles/openshift-apps/message-tagging-service/vars/main.yml b/roles/openshift-apps/message-tagging-service/vars/main.yml
index 82cbf9ed87..76ce422b3d 100644
--- a/roles/openshift-apps/message-tagging-service/vars/main.yml
+++ b/roles/openshift-apps/message-tagging-service/vars/main.yml
@@ -1,5 +1,4 @@
 app: message-tagging-service
-app_name: message-tagging-service
 description: message-tagging-service
 appowners:
   - mizdebsk