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/resources/config/mso/mso-docker.json | |
| parent | 5bfce69c0b6919ac0dff24a09973253f2c2158bb (diff) | |
| parent | ad9b376c2c47e46e30590bb0a8fe66fdb7badbab (diff) | |
Merge "[SO] Fix so-openstack-adapter support for Keystone V3 api"
Diffstat (limited to 'kubernetes/so/resources/config/mso/mso-docker.json')
| -rwxr-xr-x | kubernetes/so/resources/config/mso/mso-docker.json | 6 |
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" } ], |