From: Bin Yang <bin.yang@windriver.com>
Date: Tue, 8 Sep 2020 03:20:43 +0000 (+0800)
Subject: [MULTICLOUD] provision multicloud-pike with msb https endpoint
X-Git-Tag: 7.0.0~226^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=7c309a53e5b4c0b65d53b233a34d806b9228d08c

[MULTICLOUD] provision multicloud-pike with msb https endpoint

ONAP MSB component disabled http endpoint during Frankfurt release
multicloud-pike component has to utilize MSB https endpoint instead

Issue-ID: MULTICLOUD-1195
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: Ieea57dce0cebe85771d6d19932cd48085da54da0
---

diff --git a/kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml
index 76f3e8cbdc..bfcacb8013 100644
--- a/kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml
@@ -40,6 +40,8 @@ spec:
     spec:
      containers:
      - env:
+       - name: MSB_PROTO
+         value: {{ .Values.config.msbprotocol }}
        - name: MSB_ADDR
          value: "{{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}"
        - name: MSB_PORT
@@ -54,6 +56,8 @@ spec:
          value: "{{ .Values.config.aai.username }}"
        - name: AAI_PASSWORD
          value: "{{ .Values.config.aai.password }}"
+       - name: SSL_ENABLED
+         value: "{{ .Values.config.ssl_enabled }}"
        name: {{ include "common.name" . }}
        volumeMounts:
        - mountPath: /var/log/onap
diff --git a/kubernetes/multicloud/charts/multicloud-pike/values.yaml b/kubernetes/multicloud/charts/multicloud-pike/values.yaml
index ec79a1a847..50ced500d5 100644
--- a/kubernetes/multicloud/charts/multicloud-pike/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-pike/values.yaml
@@ -31,8 +31,10 @@ istioSidecar: true
 
 # application configuration
 config:
+  ssl_enabled: false
+  msbprotocol: https
   msbgateway: msb-iag
-  msbPort: 80
+  msbPort: 443
   aai:
     port: 8443
     schemaVersion: v13