diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-10-29 19:01:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-10-29 19:01:15 +0000 |
| commit | 0096ca03c48a0d2aa01a239080ca6d224bea7eca (patch) | |
| tree | 7b163a2fa2f6d17954298d040144e22f74e4172e /kubernetes/so/components/so-monitoring/resources | |
| parent | 5e8fceac9dd7be2eb33ddcc49490501588efdfe0 (diff) | |
| parent | cd2e66f770d8778dbd5c95a73fa810b9ee0ee779 (diff) | |
Merge "[SO] Enable SO-Monitoring - use HTTPS and certInitializer"
Diffstat (limited to 'kubernetes/so/components/so-monitoring/resources')
| -rw-r--r-- | kubernetes/so/components/so-monitoring/resources/config/overrides/override.yaml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/kubernetes/so/components/so-monitoring/resources/config/overrides/override.yaml b/kubernetes/so/components/so-monitoring/resources/config/overrides/override.yaml index c2e6ad06f3..cf54fa43f8 100644 --- a/kubernetes/so/components/so-monitoring/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-monitoring/resources/config/overrides/override.yaml @@ -1,8 +1,17 @@ server: port: {{ index .Values.containerPort }} + {{- if .Values.global.aafEnabled }} + ssl: + keyStore: ${KEYSTORE} + keyStorePassword: ${KEYSTORE_PASSWORD} + trustStore: ${TRUSTSTORE} + trustStorePassword: ${TRUSTSTORE_PASSWORD} + {{- end }} tomcat: max-threads: 50 + {{- if not .Values.global.aafEnabled }} ssl-enable: false + {{- end }} camunda: rest: api: @@ -15,3 +24,12 @@ mso: api: url: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/infraActiveRequests/ auth: Basic YnBlbDpwYXNzd29yZDEk +spring: + main: + allow-bean-definition-overriding: true + security: + usercredentials: + - + username: ${SO_MONITORING_USERNAME} + password: ${SO_MONITORING_PASSWORD} + role: GUI-Client |