summaryrefslogtreecommitdiffstats
path: root/kubernetes/so/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/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/resources')
-rwxr-xr-xkubernetes/so/resources/config/mso/mso-docker.json6
1 files changed, 5 insertions, 1 deletions
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"
}
],