[MULTICLOUD] Correction for AAI service port in MultiCloud API

AAI service port changed to 80 and service aai-internal
additionally the AAI_PROTOCOL is added, which requites a patch
for MultiCloud (https://jira.onap.org/browse/MULTICLOUD-1495)

Issue-ID: OOM-3015

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: Ibc0833dd13b7e1110c77711bae30f3af52eda0c4

diff --git a/kubernetes/multicloud/templates/deployment.yaml b/kubernetes/multicloud/templates/deployment.yaml
index ff9dac1..5e10907 100644 (file)
--- a/kubernetes/multicloud/templates/deployment.yaml
+++ b/kubernetes/multicloud/templates/deployment.yaml
@@ -55,6 +55,8 @@ spec:
          value: "{{ .Values.config.aai.username }}"
        - name: AAI_PASSWORD
          value: "{{ .Values.config.aai.password }}"
+       - name: AAI_PROTOCOL
+         value: "{{- if (include "common.needTLS" .) }}https{{ else }}http{{ end }}"
        - name: SSL_ENABLED
          value: "{{- if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }}"
        resources:

diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 91dfa5c..9ea62aa 100644 (file)
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -64,7 +64,7 @@ config:
   msbPlainPort: 80
   aai:
     aaiPort: 8443
-    aaiPlainPort: 8080
+    aaiPlainPort: 80
     schemaVersion: v13
     username: AAI
     password: AAI