Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Adding Required Attributes to Catalog DB override
[oom.git]
/
kubernetes
/
so
/
charts
/
so-catalog-db-adapter
/
resources
/
config
/
overrides
/
override.yaml
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
c59949c
..
2ea2cff
100755
(executable)
--- 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
@@
-26,6
+26,14
@@
mso:
db:
auth: Basic YnBlbDpwYXNzd29yZDEk
spring:
db:
auth: Basic YnBlbDpwYXNzd29yZDEk
spring:
+ datasource:
+ hikari:
+ jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
+ username: ${DB_USERNAME}
+ password: ${DB_PASSWORD}
+ driver-class-name: org.mariadb.jdbc.Driver
+ pool-name: catdb-pool
+ registerMbeans: true
security:
usercredentials:
-
security:
usercredentials:
-
@@
-50,6
+58,8
@@
cloud_config:
tenant_metadata: true
identity_server_type: "KEYSTONE"
identity_authentication_type: "RACKSPACE_APIKEY"
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 }}"
DEFAULT_KEYSTONE:
identity_url: "{{ .Values.config.openStackKeyStoneUrl }}"
mso_id: "{{ .Values.config.openStackUserName }}"
@@
-59,6
+69,8
@@
cloud_config:
tenant_metadata: true
identity_server_type: "KEYSTONE"
identity_authentication_type: "USERNAME_PASSWORD"
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"
cloud_sites:
Dallas:
region_id: "DFW"