Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[COMMON] Use common secret template in dgbuilder"
[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
b643c4a
..
fb83e4e
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
@@
-19,12
+19,14
@@
ssl-enable: false
mso:
logPath: logs
site-name: onapheat
mso:
logPath: logs
site-name: onapheat
+ config:
+ cadi: {{ include "cadi.keys" . | nindent 8}}
catalog:
db:
spring:
endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
catalog:
db:
spring:
endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
- auth:
Basic YnBlbDpwYXNzd29yZDEk
+ auth:
{{ include "helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.adapters.db.auth )}}
spring:
datasource:
hikari:
spring:
datasource:
hikari:
@@
-58,6
+60,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 }}"
@@
-65,8
+69,10
@@
cloud_config:
admin_tenant: "{{ .Values.config.openStackServiceTenantName }}"
member_role: "admin"
tenant_metadata: true
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"
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"