From b0d26de32295cd6326340e590d338a210e83086f Mon Sep 17 00:00:00 2001
From: jmac <james.macnider@amdocs.com>
Date: Mon, 7 May 2018 14:38:16 +0000
Subject: Resolve UEB listener dblib config issue

Change-Id: If925a7855b83beba86e769c1350fd65dc4165531
Signed-off-by: jmac <james.macnider@amdocs.com>
Issue-ID: OOM-1049
---
 kubernetes/sdnc/charts/ueb-listener/templates/configmap.yaml  | 2 +-
 kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'kubernetes/sdnc/charts/ueb-listener/templates')

diff --git a/kubernetes/sdnc/charts/ueb-listener/templates/configmap.yaml b/kubernetes/sdnc/charts/ueb-listener/templates/configmap.yaml
index 397303ffd8..fd8934b22c 100644
--- a/kubernetes/sdnc/charts/ueb-listener/templates/configmap.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/templates/configmap.yaml
@@ -15,7 +15,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: sdnc-ueb-configmap
+  name: {{ include "common.fullname" . }}
   namespace: {{ include "common.namespace" . }}
 data:
 {{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml b/kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml
index e3f324e046..48de1dd668 100644
--- a/kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml
@@ -66,9 +66,8 @@ spec:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
-        - mountPath: /opt/onap/sdnc/data/properties/ueb-listener.properties
-          subPath: ueb-listener.properties
-          name: ueb-config
+        - mountPath: {{ .Values.config.configDir }}
+          name: {{ include "common.fullname" . }}
         resources:
 {{ toYaml .Values.resources | indent 12 }}
         {{- if .Values.nodeSelector }}
@@ -84,8 +83,8 @@ spec:
         - name: localtime
           hostPath:
             path: /etc/localtime
-        - name: ueb-config
+        - name: {{ include "common.fullname" . }}
           configMap:
-            name: sdnc-ueb-configmap
+            name: {{ include "common.fullname" . }}
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file
-- 
cgit 1.2.3-korg