From ad9b376c2c47e46e30590bb0a8fe66fdb7badbab Mon Sep 17 00:00:00 2001 From: Marcin Wilk Date: Wed, 13 Oct 2021 18:20:43 +0200 Subject: [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 --- kubernetes/so/resources/config/mso/mso-docker.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'kubernetes/so/resources') diff --git a/kubernetes/so/resources/config/mso/mso-docker.json b/kubernetes/so/resources/config/mso/mso-docker.json index 167a8edc09..119a31304a 100755 --- a/kubernetes/so/resources/config/mso/mso-docker.json +++ b/kubernetes/so/resources/config/mso/mso-docker.json @@ -84,13 +84,17 @@ [ { "dcp_clli": "DEFAULT_KEYSTONE", + {{- if eq .Values.config.openStackKeystoneVersion "KEYSTONE_V3" }} + "identity_url": "{{ .Values.config.openStackKeyStoneUrl }}/v3", + {{- else }} "identity_url": "{{ .Values.config.openStackKeyStoneUrl }}/v2.0", + {{- end }} "mso_id": "{{ .Values.config.openStackUserName }}", "mso_pass": "{{ .Values.config.openStackEncryptedPasswordHere }}", "admin_tenant":"{{ .Values.config.openStackServiceTenantName }}", "member_role": "admin", "tenant_metadata": "true", - "identity_server_type": "KEYSTONE", + "identity_server_type": "{{ .Values.config.openStackKeystoneVersion }}", "identity_authentication_type": "USERNAME_PASSWORD" } ], -- cgit 1.2.3-korg