From: mayankg2703 <mayank.gupta@amdocs.com>
Date: Wed, 7 Feb 2018 05:56:34 +0000 (+0000)
Subject: aai model loader config alignment
X-Git-Tag: 4.0.0-ONAP~15^2~169^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=934c1153c841d82b178edaae1b2f768fadf0eec0;p=aai%2Foom.git

aai model loader config alignment

Change-Id: Ifc5db843fb45c458c2d2a9294c52201fc27f425e
Issue-ID: OOM-669
Signed-off-by: mayankg2703 <mayank.gupta@amdocs.com>
---

diff --git a/resources/model-loader/conf/logback.xml b/resources/config/log/model-loader/logback.xml
similarity index 100%
rename from resources/model-loader/conf/logback.xml
rename to resources/config/log/model-loader/logback.xml
diff --git a/templates/modelloader-deployment-configmap.yaml b/templates/modelloader-deployment-configmap.yaml
index 7f37bd6..e5a59a1 100644
--- a/templates/modelloader-deployment-configmap.yaml
+++ b/templates/modelloader-deployment-configmap.yaml
@@ -15,4 +15,12 @@ metadata:
 type: Opaque
 data:
 {{ tpl (.Files.Glob "resources/config/model-loader/appconfig/auth/*").AsSecrets . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: aai-model-loader-log-configmap
+  namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/log/model-loader/logback.xml").AsConfig . | indent 2 }}
 #{{ end }}
diff --git a/templates/modelloader-deployment.yaml b/templates/modelloader-deployment.yaml
index c813058..2508446 100644
--- a/templates/modelloader-deployment.yaml
+++ b/templates/modelloader-deployment.yaml
@@ -68,16 +68,8 @@ spec:
         emptyDir: {}
       - name: aai-model-loader-log-conf
         configMap:
-         name: aai-model-loader-configmap
+         name: aai-model-loader-log-configmap
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: aai-model-loader-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
-data:
-{{ (.Files.Glob "resources/model-loader/conf/logback.xml").AsConfig | indent 2 }}
 #{{ end }}