[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>
(cherry picked from commit ad9b376c2c47e46e30590bb0a8fe66fdb7badbab)

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 15f08bc..e332f98 100755 (executable)
--- 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 2ac8295..ab97d40 100755 (executable)
--- 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: {}

diff --git a/kubernetes/so/resources/config/mso/mso-docker.json b/kubernetes/so/resources/config/mso/mso-docker.json
index 167a8ed..119a313 100755 (executable)
--- 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"
         }
       ],

diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 988b8ef..b14c014 100755 (executable)
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -257,6 +257,8 @@ affinity: {}
 config:
   logstashServiceName: log-ls
   logstashPort: 5044
+  # "KEYSTONE" for keystone v2, "KEYSTONE_V3" for keystone v3
+  openStackKeystoneVersion: "KEYSTONE"
 
 #Used only if localCluster is enabled. Instantiates SO's own cassandra cluster
 #helm deploy demo local/onap --namespace onap --verbose --set so.enabled=true \