summaryrefslogtreecommitdiffstats
path: root/kubernetes/so
diff options
context:
space:
mode:
authorRamesh Parthasarathy <ramesh.parthasarathy@att.com>2020-03-18 00:00:30 +0000
committerRamesh Parthasarathy <ramesh.parthasarathy@att.com>2020-03-18 14:07:24 +0000
commitbb61192fb765abe54ad96d868660f12a0515dff4 (patch)
tree93d9420fdd41cbaacd4900bc1fc1172c40c798a2 /kubernetes/so
parentf2cff9603964bdb9a25e6ba6dfdfbd8db918bf56 (diff)
Fixed openstack credentials for calling bpmn external tasks
when so.global.security.aaf.enabled is false, openstack should use basic credentials to call bpmn. This is being addressed in this fix Issue-ID: SO-2747 Signed-off-by: Ramesh Parthasarathy(rp6768)<ramesh.parthasarathy@att.com> Change-Id: Ie16f6a8d94a3f099b461eefbfc478723c2a9a9c0
Diffstat (limited to 'kubernetes/so')
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml5
-rwxr-xr-xkubernetes/so/values.yaml1
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