summaryrefslogtreecommitdiffstats
path: root/kubernetes/so
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-02-13 11:08:06 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-02-13 11:40:26 +0100
commit04f765e5078003b580b4465542b7f127cd9ac497 (patch)
treebdd650e4bf15b0ab6341155379daecd14de12729 /kubernetes/so
parent7d05036254727b7309a85eb85a82eb634085790a (diff)
[SO] Enable use of Keystone v3
SO can handle keystone v3 but override file must be capable to handle this. If openStackKeystoneVersion is set to "KEYSTONE_V3" in so-catalog-db-adapter config part, SO will be able to use keystone v3 for OpenStack Issue-ID: OOM-2221 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I14db318d25842a08ef380f6edb708e26dae050ad
Diffstat (limited to 'kubernetes/so')
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml2
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/values.yaml2
2 files changed, 3 insertions, 1 deletions
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml
index 952642c48a..fb83e4e26b 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml
@@ -69,7 +69,7 @@ cloud_config:
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"
project_domain_name: "{{ .Values.config.openStackProjectDomainName }}"
user_domain_name: "{{ .Values.config.openStackUserDomainName }}"
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/values.yaml b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
index 4685fd166a..c4e23164f2 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
@@ -83,6 +83,8 @@ config:
openStackTenantId: "d570c718cbc545029f40e50b75eb13df"
openStackProjectDomainName: "openStackProjectDomainName"
openStackUserDomainName: "openStackUserDomainName"
+ # "KEYSTONE" for keystone v2, "KEYSTONE_V3" for keystone v3
+ openStackKeystoneVersion: "KEYSTONE"
nodeSelector: {}
tolerations: []
affinity: {}