aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-09-21 06:53:31 +0000
committerGerrit Code Review <gerrit@onap.org>2020-09-21 06:53:31 +0000
commit2eb8c16af6836b513aec63fc7177c5cd5862ad88 (patch)
treee23aa6a49017b1d789b789534a7ee713c7c7b498
parent1d7d0e2834531a278b0c3af57ce4cc6e2b62b3ee (diff)
parent7c309a53e5b4c0b65d53b233a34d806b9228d08c (diff)
Merge "[MULTICLOUD] provision multicloud-pike with msb https endpoint"
-rw-r--r--kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml4
-rw-r--r--kubernetes/multicloud/charts/multicloud-pike/values.yaml4
2 files changed, 7 insertions, 1 deletions
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