aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorAndrewLamb <andrew.a.lamb@est.tech>2019-10-25 10:29:49 +0100
committerAndrewLamb <andrew.a.lamb@est.tech>2019-10-25 12:17:42 +0100
commit43687c069db87453840ee3fd0d8473deb4e5a7d2 (patch)
tree9d8971ba720b7229a2c2d40026d46b289e118288 /kubernetes
parentbfc7fe22f3bc058639c2f90633970b18e3101ef2 (diff)
Adding Required Attributes to Catalog DB override
Change-Id: Ia502d96217f1e1ec904a26b9c56f7b288fb1f812 Issue-ID: OOM-2149 Signed-off-by: AndrewLamb <andrew.a.lamb@est.tech>
Diffstat (limited to 'kubernetes')
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml4
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/values.yaml2
2 files changed, 6 insertions, 0 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 b643c4ae9e..2ea2cffe27 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
@@ -58,6 +58,8 @@ cloud_config:
tenant_metadata: true
identity_server_type: "KEYSTONE"
identity_authentication_type: "RACKSPACE_APIKEY"
+ project_domain_name: "PROJECT_DOMAIN_NAME"
+ user_domain_name: "USER_DOMAIN_NAME"
DEFAULT_KEYSTONE:
identity_url: "{{ .Values.config.openStackKeyStoneUrl }}"
mso_id: "{{ .Values.config.openStackUserName }}"
@@ -67,6 +69,8 @@ cloud_config:
tenant_metadata: true
identity_server_type: "KEYSTONE"
identity_authentication_type: "USERNAME_PASSWORD"
+ project_domain_name: "{{ .Values.config.openStackProjectDomainName }}"
+ user_domain_name: "{{ .Values.config.openStackUserDomainName }}"
cloud_sites:
Dallas:
region_id: "DFW"
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/values.yaml b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
index 57b7fe50b2..4b2a4d6cc1 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
@@ -81,6 +81,8 @@ config:
openStackServiceTenantName: "service"
openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
openStackTenantId: "d570c718cbc545029f40e50b75eb13df"
+ openStackProjectDomainName: "openStackProjectDomainName"
+ openStackUserDomainName: "openStackUserDomainName"
nodeSelector: {}
tolerations: []
affinity: {}