diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-03-18 17:47:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-03-18 17:47:03 +0000 |
| commit | 0f90269b150bbb38773e421ac754f1c022cf9ea3 (patch) | |
| tree | 7ec2ec8548f24ebb37755de61731c04bf7553f93 | |
| parent | fe126ba8a0beb1e0c55088cf5bf8fee76bcafdec (diff) | |
| parent | bb61192fb765abe54ad96d868660f12a0515dff4 (diff) | |
Merge "Fixed openstack credentials for calling bpmn external tasks"
| -rwxr-xr-x | kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml | 5 | ||||
| -rwxr-xr-x | kubernetes/so/values.yaml | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml index ffebc4c794..117d270ab0 100755 --- a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml @@ -105,7 +105,12 @@ mso: endpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/sobpmnengine msoKey: {{ .Values.mso.msoKey }} config: + {{ if eq .Values.global.security.aaf.enabled true }} cadi: {{ include "cadi.keys" . | nindent 8}} + {{- else }} + cadi: + aafId: {{ .Values.mso.basicUser }} + {{- end }} catalog: db: spring: diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml index a792ff9acd..807d2a6c7e 100755 --- a/kubernetes/so/values.yaml +++ b/kubernetes/so/values.yaml @@ -231,6 +231,7 @@ so-openstack-adapter: mso: msoKey: 07a7159d3bf51a0e53be7a8f89699be7 auth: BEA8637716A7EB617DF472BA6552D22F68C1CB17B0D094D77DDA562F4ADAAC4457CAB848E1A4 + basicUser: poBpmn config: cadi: aafId: so@so.onap.org |