From: mayankg2703 <mayank.gupta@amdocs.com>
Date: Wed, 7 Feb 2018 06:02:17 +0000 (+0000)
Subject: aai search data  config alignment
X-Git-Tag: 2.0.0-ONAP~458^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4879820e3a534594e2793733c4e705b90d4ea874;p=oom.git

aai search data  config alignment

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

diff --git a/kubernetes/aai/resources/search-data-service/conf/logback.xml b/kubernetes/aai/resources/config/log/search-data-service/logback.xml
similarity index 100%
rename from kubernetes/aai/resources/search-data-service/conf/logback.xml
rename to kubernetes/aai/resources/config/log/search-data-service/logback.xml
diff --git a/kubernetes/aai/templates/search-data-service-configmap.yaml b/kubernetes/aai/templates/search-data-service-configmap.yaml
index c392e412aa..8f707d4ca3 100644
--- a/kubernetes/aai/templates/search-data-service-configmap.yaml
+++ b/kubernetes/aai/templates/search-data-service-configmap.yaml
@@ -23,4 +23,12 @@ metadata:
   namespace: {{ .Values.nsPrefix }}-aai
 data:
 {{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/auth/search_policy.json").AsSecrets . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: aai-search-data-service-log-configmap
+  namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/log/search-data-service/logback.xml").AsConfig . | indent 2 }}
 #{{ end }}
diff --git a/kubernetes/aai/templates/search-data-service-deployment.yaml b/kubernetes/aai/templates/search-data-service-deployment.yaml
index 392a754459..5f667106a7 100644
--- a/kubernetes/aai/templates/search-data-service-deployment.yaml
+++ b/kubernetes/aai/templates/search-data-service-deployment.yaml
@@ -89,16 +89,8 @@ spec:
         emptyDir: {}
       - name: aai-search-data-service-log-conf
         configMap:
-         name: aai-search-data-service-configmap
+         name: aai-search-data-service-log-configmap
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: aai-search-data-service-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
-data:
-{{ (.Files.Glob "resources/search-data-service/conf/logback.xml").AsConfig | indent 2 }}
 #{{ end }}