Merge "Fixed openstack credentials for calling bpmn external tasks"

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 ffebc4c..117d270 100755 (executable)
--- 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 a792ff9..807d2a6 100755 (executable)
--- 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