summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFiachra Corcoran <fiachra.corcoran@est.tech>2022-11-09 12:16:25 +0000
committerGerrit Code Review <gerrit@onap.org>2022-11-09 12:16:25 +0000
commita8a5ef9e45f3b3b334402b2e04abf0cc0892f636 (patch)
tree5b551239911b71fa7e647049efda57547e366003
parentbb23177521042d092d94922187b2a7cb9052c85a (diff)
parentfcb7878f85baf46713e5f63db8b2a50a18d0da79 (diff)
Merge "[MULTICLOUD] Correction for AAI service port in MultiCloud API"
-rw-r--r--kubernetes/multicloud/templates/deployment.yaml2
-rw-r--r--kubernetes/multicloud/values.yaml2
2 files changed, 3 insertions, 1 deletions
diff --git a/kubernetes/multicloud/templates/deployment.yaml b/kubernetes/multicloud/templates/deployment.yaml
index ff9dac1898..5e1090798e 100644
--- 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 91dfa5cacb..9ea62aa98f 100644
--- 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