diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2020-02-04 01:03:14 +0800 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2020-02-04 23:36:52 +0800 |
| commit | 842a484256b8bf39dc00a70f389914ef733f990f (patch) | |
| tree | 1992e239716c15ed76d2feaf6fe9d6e81e13bf40 /kubernetes/multicloud/charts/multicloud-fcaps | |
| parent | a4f3a79f2fc88ef8e50d2cc99c0fae90ec3874f1 (diff) | |
Enable multicloud openstack https endpoints
Make use of msb iag with https as well
Issue-ID: MULTICLOUD-978
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: I79c988e2ac13f1c11be8ca5ac9ccd44c21418cb4
Diffstat (limited to 'kubernetes/multicloud/charts/multicloud-fcaps')
3 files changed, 11 insertions, 3 deletions
diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml index e2837ef7f0..3f09b08eb8 100644 --- a/kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml +++ b/kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml @@ -40,6 +40,8 @@ spec: spec: containers: - env: + - name: MSB_PROTO + value: {{ .Values.config.msbprotocol }}.{{ include "common.namespace" . }} - 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 @@ -74,7 +78,7 @@ spec: httpGet: path: /api/multicloud-fcaps/v1/healthcheck port: {{ .Values.service.internalPort }} - scheme: HTTP + scheme: HTTPS initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} timeoutSeconds: {{ .Values.liveness.timeoutSeconds }} diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-fcaps/templates/service.yaml index 75cd4c0dda..fabe32e0ff 100644 --- a/kubernetes/multicloud/charts/multicloud-fcaps/templates/service.yaml +++ b/kubernetes/multicloud/charts/multicloud-fcaps/templates/service.yaml @@ -32,6 +32,7 @@ metadata: "url": "/api/multicloud-fcaps/v0", "protocol": "REST", "port": "{{ .Values.service.externalPort }}", + "enable_ssl": {{ .Values.config.ssl_enabled }}, "visualRange": "1" }, { @@ -40,6 +41,7 @@ metadata: "url": "/api/multicloud-fcaps/v1", "protocol": "REST", "port": "{{ .Values.service.externalPort }}", + "enable_ssl": {{ .Values.config.ssl_enabled }}, "visualRange": "1" } ]' diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml b/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml index 075a196cf8..4b34784ccd 100644 --- a/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml +++ b/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml @@ -23,7 +23,7 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/multicloud/openstack-fcaps:1.4.1 +image: onap/multicloud/openstack-fcaps:1.5.3 pullPolicy: Always #Istio sidecar injection policy @@ -31,8 +31,10 @@ istioSidecar: false # application configuration config: + ssl_enabled: true + msbprotocol: https msbgateway: msb-iag - msbPort: 80 + msbPort: 443 aai: port: 8443 schemaVersion: v13 |