summaryrefslogtreecommitdiffstats
path: root/kubernetes/so/components/so-openstack-adapter/resources
diff options
context:
space:
mode:
authorMarcin Wilk <m.wilk@samsung.com>2021-10-13 18:20:43 +0200
committerKrzysztof Opasiak <k.opasiak@samsung.com>2021-10-27 18:42:23 +0000
commitad9b376c2c47e46e30590bb0a8fe66fdb7badbab (patch)
tree5e77c17675e8a829fa7c158c48401dd09c27ae37 /kubernetes/so/components/so-openstack-adapter/resources
parent2c2be1eea53e97cc1972c0b89571baff92e59484 (diff)
[SO] Fix so-openstack-adapter support for Keystone V3 api
Currently so-openstack-adapter configuration file contains hardcoded v2.0 Keystone endpoint. This fix allows for defining Keystone api version via values/override file Change-Id: Ib81c2888784d3d41c1ac2464c122a426743023dd Issue-ID: OOM-2866 Signed-off-by: Marcin Wilk <m.wilk@samsung.com>
Diffstat (limited to 'kubernetes/so/components/so-openstack-adapter/resources')
-rwxr-xr-xkubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml8
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