From b0d26de32295cd6326340e590d338a210e83086f Mon Sep 17 00:00:00 2001 From: jmac Date: Mon, 7 May 2018 14:38:16 +0000 Subject: Resolve UEB listener dblib config issue Change-Id: If925a7855b83beba86e769c1350fd65dc4165531 Signed-off-by: jmac Issue-ID: OOM-1049 --- .../sdnc/charts/sdnc-portal/resources/config/admportal.json | 4 ++-- .../charts/ueb-listener/resources/config/ueb-listener.properties | 2 +- kubernetes/sdnc/charts/ueb-listener/templates/configmap.yaml | 2 +- kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml | 9 ++++----- kubernetes/sdnc/charts/ueb-listener/values.yaml | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) (limited to 'kubernetes') diff --git a/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json b/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json index afd872129a..3e873214b4 100644 --- a/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json +++ b/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json @@ -39,8 +39,8 @@ "dbPassword": "gamma", "dbName": "sdnctl", "odlProtocol": "http", - "odlHost": "{{.Release.Name}}-sdnc.{{.Release.Namespace}}", - "odlConexusHost": "{{.Release.Name}}-sdnc.{{.Release.Namespace}}", + "odlHost": "sdnc.{{.Release.Namespace}}", + "odlConexusHost": "sdnc.{{.Release.Namespace}}", "odlPort": "8181", "odlConexusPort": "8181", "odlUser": "admin", diff --git a/kubernetes/sdnc/charts/ueb-listener/resources/config/ueb-listener.properties b/kubernetes/sdnc/charts/ueb-listener/resources/config/ueb-listener.properties index cd184bfc32..a91ad944dd 100644 --- a/kubernetes/sdnc/charts/ueb-listener/resources/config/ueb-listener.properties +++ b/kubernetes/sdnc/charts/ueb-listener/resources/config/ueb-listener.properties @@ -6,7 +6,7 @@ org.onap.ccsdk.sli.northbound.uebclient.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84 org.onap.ccsdk.sli.northbound.uebclient.user=sdnc org.onap.ccsdk.sli.northbound.uebclient.sdnc-user=admin org.onap.ccsdk.sli.northbound.uebclient.sdnc-passwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -org.onap.ccsdk.sli.northbound.uebclient.asdc-api-base-url=http://sdnhost.{{.Release.Namespace}}:8282/restconf/operations/ +org.onap.ccsdk.sli.northbound.uebclient.asdc-api-base-url=http://sdnc.{{.Release.Namespace}}:8282/restconf/operations/ org.onap.ccsdk.sli.northbound.uebclient.asdc-api-namespace=org:onap:ccsdk org.onap.ccsdk.sli.northbound.uebclient.spool.incoming=/opt/onap/sdnc/ueb-listener/spool/incoming org.onap.ccsdk.sli.northbound.uebclient.spool.archive=/opt/onap/sdnc/ueb-listener/spool/archive 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 diff --git a/kubernetes/sdnc/charts/ueb-listener/values.yaml b/kubernetes/sdnc/charts/ueb-listener/values.yaml index a6722eb056..f31594e69a 100644 --- a/kubernetes/sdnc/charts/ueb-listener/values.yaml +++ b/kubernetes/sdnc/charts/ueb-listener/values.yaml @@ -37,7 +37,7 @@ debugEnabled: false # application configuration config: uebPort: 3904 - mysqlChartName: sdnc-dbhost + mysqlChartName: sdnc-db sdncChartName: sdnc sdcbeChartName: sdc-be msgRouterContainerName: dmaap -- cgit 1.2.3-korg