diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-10-09 06:38:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-10-09 06:38:26 +0000 |
| commit | 066d0396971bd11ca6456ec8385e2126e7229457 (patch) | |
| tree | e7747ed4cdcc7b2151bb541d3b903076fd3af023 | |
| parent | 30b1f572f786e150da748d56b01534880edccf20 (diff) | |
| parent | 9ca9753f16d9f1fbea0f8178ac0f8cecd437aa62 (diff) | |
Merge "[MODELING] Refactor Modeling environment variables"
| -rw-r--r-- | kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml | 8 | ||||
| -rw-r--r-- | kubernetes/modeling/charts/modeling-etsicatalog/values.yaml | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml index 014013ab7a..52d675a39e 100644 --- a/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml +++ b/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml @@ -82,12 +82,12 @@ spec: initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} env: - - name: MSB_PROTO - value: "{{ .Values.config.msbProtocol }}" + - name: MSB_ADDR + value: "{{ .Values.config.msbProtocol }}://{{ .Values.config.msbServiceName }}:{{ .Values.config.msbPort }}" - name: SSL_ENABLED value: "{{ .Values.config.ssl_enabled }}" - - name: MSB_ADDR - value: "{{ .Values.config.msbServiceName }}:{{ .Values.config.msbPort }}" + - name: MSB_ENABLED + value: "{{ .Values.config.msb_enabled }}" - name: DB_IP value: "{{ include "common.mariadbService" . }}" - name: DB_PORT diff --git a/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml index 5926584ef9..9bc8aa0433 100644 --- a/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml +++ b/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml @@ -82,6 +82,7 @@ config: msbProtocol: https msbServiceName: msb-iag msbPort: 443 + msb_enabled: true #application configuration user password about mariadb db: userName: etsicatalog |