diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-10-31 07:51:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-10-31 07:51:38 +0000 |
| commit | c7420cbba0793af8e5ff927934722d7c3f19c06a (patch) | |
| tree | a17af1ec8ce6f05230871bd25535ac1980953a95 /kubernetes/so/components | |
| parent | 5bfce69c0b6919ac0dff24a09973253f2c2158bb (diff) | |
| parent | ad9b376c2c47e46e30590bb0a8fe66fdb7badbab (diff) | |
Merge "[SO] Fix so-openstack-adapter support for Keystone V3 api"
Diffstat (limited to 'kubernetes/so/components')
| -rwxr-xr-x | kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml | 8 | ||||
| -rwxr-xr-x | kubernetes/so/components/so-openstack-adapter/values.yaml | 2 |
2 files changed, 10 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 diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml index 2ac829592c..ab97d406a4 100755 --- a/kubernetes/so/components/so-openstack-adapter/values.yaml +++ b/kubernetes/so/components/so-openstack-adapter/values.yaml @@ -150,6 +150,8 @@ config: openStackServiceTenantName: "service" openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e" openStackTenantId: "d570c718cbc545029f40e50b75eb13df" + # "KEYSTONE" for keystone v2, "KEYSTONE_V3" for keystone v3 + openStackKeystoneVersion: "KEYSTONE" nodeSelector: {} tolerations: [] affinity: {} |