diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2020-02-05 07:31:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-02-05 07:31:50 +0000 |
| commit | 00fd764cb5bdfd020e05a2391639857f6181f0cb (patch) | |
| tree | 5964791a1dcce49670eb7227157f2b2b8a8a6a87 /kubernetes/multicloud/charts/multicloud-fcaps/templates | |
| parent | d622ece51e323fe4586a85d81bf014bfa61bca40 (diff) | |
| parent | 842a484256b8bf39dc00a70f389914ef733f990f (diff) | |
Merge "Enable multicloud openstack https endpoints"
Diffstat (limited to 'kubernetes/multicloud/charts/multicloud-fcaps/templates')
| -rw-r--r-- | kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/multicloud/charts/multicloud-fcaps/templates/service.yaml | 2 |
2 files changed, 7 insertions, 1 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" } ]' |