From: aosull01 <adrian.osullivan@huawei.com>
Date: Thu, 9 Apr 2020 10:05:30 +0000 (+0100)
Subject: test DMaaP connection via https
X-Git-Tag: 6.0.0~152^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=25de8362861247716821888709efc83cc644b985;p=oom.git

test DMaaP connection via https

Issue-ID: EXTAPI-427

Signed-off-by: aosull01 <adrian.osullivan@huawei.com>
Change-Id: I2a35284b9de2153b473b4bdde1d77be6a015b620
---

diff --git a/kubernetes/nbi/templates/deployment.yaml b/kubernetes/nbi/templates/deployment.yaml
index 3283239100..1b4195c733 100644
--- a/kubernetes/nbi/templates/deployment.yaml
+++ b/kubernetes/nbi/templates/deployment.yaml
@@ -57,10 +57,7 @@ spec:
               -Dserver.ssl.key-store-password=$cadi_keystore_password_p12  \
               -Djavax.net.ssl.trustStoreType=jks\
               -Djava.security.egd=file:/dev/./urandom -Dserver.port=8443"
-            {{- if eq "DEBUG" .Values.config.loglevel }}
-            export JAVA_DEBUG="-Djavax.net.debug=all"
-            {{- end }}
-            exec java -XX:+UseContainerSupport $JAVA_DEBUG $JAVA_OPTS -jar /opt/onap/app.jar
+            exec java -XX:+UseContainerSupport $JAVA_OPTS -jar /opt/onap/app.jar
           {{- end }}
           {{ if .Values.liveness.enabled }}
           livenessProbe:
@@ -116,7 +113,7 @@ spec:
               value: {{ .Values.so_authorization }}
             {{- end }}
             - name: DMAAP_HOST
-              value: "http://message-router.{{ include "common.namespace" . }}:3904"
+              value: "https://message-router.{{ include "common.namespace" . }}:3905"
             - name: LOGGING_LEVEL_ORG_ONAP_NBI
               value: {{ .Values.config.loglevel }}
             - name: MSB_ENABLED
diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index ceab7fad2a..dcf9573bc7 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -75,7 +75,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/externalapi/nbi:6.0.1
+image: onap/externalapi/nbi:6.0.2
 pullPolicy: IfNotPresent
 sdc_authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
 aai_authorization: Basic QUFJOkFBSQ==