diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-11-04 15:08:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-11-04 15:08:18 +0000 |
| commit | c0d611ce70bcc49952ca87de8a62249c60506346 (patch) | |
| tree | 9575a85ac746ac931dd88cb34a04a5f5ef92f4e7 /kubernetes/so/components/so-openstack-adapter/resources/config | |
| parent | 248e825bc220b9a0ccf37ad6b85ad05a4b7cf342 (diff) | |
| parent | da32e95eedb5514f8c12df10b07f1473c7aa0e51 (diff) | |
Merge "[SO] Fix so-openstack-adapter support for Keystone V3 api" into istanbul
Diffstat (limited to 'kubernetes/so/components/so-openstack-adapter/resources/config')
| -rwxr-xr-x | kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml index 15f08bccc6..e332f98302 100755 --- a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml @@ -57,7 +57,11 @@ org: onap: so: adapters: + {{- if eq .Values.config.openStackKeystoneVersion "KEYSTONE_V3" }} + default_keystone_url_version: /v3 + {{- else }} default_keystone_url_version: /v2.0 + {{- end }} default_keystone_reg_ex: "/[vV][0-9]" vnf: bpelauth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.org.onap.so.adapters.bpelauth )}} @@ -79,7 +83,11 @@ org: retrylist: 408,429,500,502,503,504,900 encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7 tenant: + {{- if eq .Values.config.openStackKeystoneVersion "KEYSTONE_V3" }} + default_keystone_url_version: /v3 + {{- else }} default_keystone_url_version: /v2.0 + {{- end }} default_keystone_reg_ex: "/[vV][0-9]" default_tenant_description: Tenant default_region_type: single |