diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2019-11-12 17:22:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-11-12 17:22:02 +0000 |
| commit | 41a8c1ebd178fd7420a8127a4c8156ef50a0b3a1 (patch) | |
| tree | 4193f852fad49679cfe9cd2673ef824bf6947dcd | |
| parent | d56c7fdc84ae5c78ef9e7670a6952e31fd06d043 (diff) | |
| parent | 84675f7f518535e2e1c021b00ff1cc77b7e09b9b (diff) | |
Merge "VNFM-adapter health check failing"
| -rwxr-xr-x | kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml | 2 | ||||
| -rwxr-xr-x | kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml index d1f23e9a10..5930b5d5be 100755 --- a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml +++ b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml @@ -360,7 +360,7 @@ spring: so: vnfm: adapter: - url: http://so-vnfm-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1/ + url: https://so-vnfm-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1/ auth: Basic dm5mbTpwYXNzd29yZDEk org: onap: diff --git a/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml index 8650f05897..760fa16e75 100755 --- a/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml @@ -25,7 +25,17 @@ spring: password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke' role: ACTUATOR server: - port: {{ index .Values.containerPort }} + port: {{ index .Values.containerPort }} + ssl: + key-alias: so@so.onap.org + key--store-password: 'ywsqCy:EEo#j}HJHM7z^Rk[L' + key-store: classpath:so-vnfm-adapter.p12 + key-store-type: PKCS12 +http: + client: + ssl: + trust-store: classpath:org.onap.so.trust.jks + trust-store-password: ',sx#.C*W)]wVgJC6ccFHI#:H' mso: key: 07a7159d3bf51a0e53be7a8f89699be7 site-name: localSite @@ -38,4 +48,4 @@ sdc: key: 566B754875657232314F5548556D3665 endpoint: https://sdc-be.{{ include "common.namespace" . }}:8443 vnfmadapter: - endpoint: http://so-vnfm-adapter.{{ include "common.namespace" . }}:9092 + endpoint: https://so-vnfm-adapter.{{ include "common.namespace" . }}:9092 |