From b717cce649889ecf9d324f0b463586972e61899e Mon Sep 17 00:00:00 2001 From: jmac Date: Fri, 27 Apr 2018 19:45:00 +0000 Subject: Fix SDNC DMaaP connectivity issues DMaaP listener was not trying to connect to the right service name, so it was failing. In addition, the pod doesn't wait for the dmaap pod to be up and running before starting, so I've added that dependency. Lastly, I removed the config of the DMaaP port from the top level values.yaml files, as out of the box it's very unlikely this would be changed. Change-Id: I5a190b39f4f163b020189ac9dd178040f80125cd Signed-off-by: jmac Issue-ID: SDNC-293 --- .../sdnc/charts/dmaap-listener/resources/config/dhcpalert.properties | 2 +- kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml | 2 ++ kubernetes/sdnc/charts/dmaap-listener/values.yaml | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'kubernetes/sdnc') diff --git a/kubernetes/sdnc/charts/dmaap-listener/resources/config/dhcpalert.properties b/kubernetes/sdnc/charts/dmaap-listener/resources/config/dhcpalert.properties index dc0deb278e..de1346a461 100644 --- a/kubernetes/sdnc/charts/dmaap-listener/resources/config/dhcpalert.properties +++ b/kubernetes/sdnc/charts/dmaap-listener/resources/config/dhcpalert.properties @@ -14,7 +14,7 @@ password =admin contenttype =application/json authKey=fxoW4jZrO7mdLWWa:f4KxkoBtToyoEG7suMoV8KhnkwM= authDate=2016-02-18T13:57:37-0800 -host=dmaap.{{.Release.Namespace}}:3904 +host=message-router.{{.Release.Namespace}}:{{.Values.config.dmaapPort}} topic=VCPE-DHCP-EVENT group=jmsgrp id=sdnc1 diff --git a/kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml b/kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml index e712a410c8..733b21e7bc 100644 --- a/kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml +++ b/kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml @@ -38,6 +38,8 @@ spec: - {{ .Values.config.mysqlChartName }} - --container-name - {{ .Values.config.sdncChartName }} + - --container-name + - {{ .Values.config.msgRouterContainerName }} env: - name: NAMESPACE valueFrom: diff --git a/kubernetes/sdnc/charts/dmaap-listener/values.yaml b/kubernetes/sdnc/charts/dmaap-listener/values.yaml index 1a5ca2cdf7..189aa72b1f 100644 --- a/kubernetes/sdnc/charts/dmaap-listener/values.yaml +++ b/kubernetes/sdnc/charts/dmaap-listener/values.yaml @@ -39,6 +39,7 @@ config: dmaapPort: 3904 mysqlChartName: sdnc-dbhost sdncChartName: sdnc + msgRouterContainerName: dmaap configDir: /opt/onap/sdnc/data/properties # default number of instances @@ -64,7 +65,7 @@ ingress: enabled: false service: - name: dmaap-listener + name: sdnc-dmaap-listener resources: {} #resources: -- cgit 1.2.3-korg