Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[SO] Cleanup of SO charts
[oom.git]
/
kubernetes
/
so
/
resources
/
config
/
overrides
/
override.yaml
diff --git
a/kubernetes/so/resources/config/overrides/override.yaml
b/kubernetes/so/resources/config/overrides/override.yaml
index
1aeb50d
..
47fc6d3
100755
(executable)
--- a/
kubernetes/so/resources/config/overrides/override.yaml
+++ b/
kubernetes/so/resources/config/overrides/override.yaml
@@
-1,22
+1,25
@@
+aai:
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
+ auth: {{ .Values.mso.aai.auth }}
server:
port: {{ index .Values.containerPort }}
tomcat:
max-threads: 50
ssl-enable: false
mso:
server:
port: {{ index .Values.containerPort }}
tomcat:
max-threads: 50
ssl-enable: false
mso:
- msoKey:
07a7159d3bf51a0e53be7a8f89699be7
- logPath:
logs
- site-name:
onapheat
+ msoKey:
{{ .Values.mso.msoKey }}
+ logPath:
./logs/apih
+ site-name:
{{ index .Values.global.app.siteName }}
adapters:
requestDb:
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
adapters:
requestDb:
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
- auth:
Basic YnBlbDpwYXNzd29yZDEk
+ auth:
{{ .Values.mso.adapters.requestDb.auth }}
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:
{{ .Values.mso.adapters.requestDb.auth }}
config:
path: /src/main/resources/
infra:
config:
path: /src/main/resources/
infra:
@@
-30,25
+33,26
@@
mso:
default:
testApi: GR_API
camundaURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/
default:
testApi: GR_API
camundaURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/
- camundaAuth:
AE2E9BE6EF9249085AF98689C4EE087736A5500629A72F35068FFB88813A023581DD6E765071F1C04075B36EA4213A
+ camundaAuth:
{{ .Values.mso.camundaAuth }}
async:
core-pool-size: 50
max-pool-size: 50
queue-capacity: 500
sdc:
client:
async:
core-pool-size: 50
max-pool-size: 50
queue-capacity: 500
sdc:
client:
- auth:
878785F4F31BC9CFA5AB52A172008212D8845ED2DE08AD5E56AF114720A4E49768B8F95CDA2EB971765D28EDCDAA24
+ auth:
{{ .Values.mso.sdc.client.auth }}
activate:
instanceid: test
userid: cs0008
activate:
instanceid: test
userid: cs0008
- endpoint: http://sdc-be.{{ include "common.namespace" . }}:8
443
+ endpoint: http://sdc-be.{{ include "common.namespace" . }}:8
080
tenant:
isolation:
retry:
count: 3
aai:
tenant:
isolation:
retry:
count: 3
aai:
- endpoint: https://aai.{{ include "common.namespace" . }}:8443
- auth: 6E081E10B1CA43A843E303733A74D9B23B601A6E22A21C7EF2C7F15A42F81A1A4E85E65268C2661F71321052C7F3E55B96A8E1E951F8BF6F
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
+ auth: {{ .Values.mso.aai.auth }}
+
extApi:
endpoint: http://nbi.onap:8080/nbi/api/v3
so:
extApi:
endpoint: http://nbi.onap:8080/nbi/api/v3
so:
@@
-57,17
+61,16
@@
mso:
username: testuser
password: VjR5NDcxSzA=
host: http://dmaap-bc.{{ include "common.namespace" . }}:8080
username: testuser
password: VjR5NDcxSzA=
host: http://dmaap-bc.{{ include "common.namespace" . }}:8080
- auth:
51EA5414022D7BE536E7516C4D1A6361416921849B72C0D6FC1C7F262FD9F2BBC2AD124190A332D9845A188AD80955567A4F975C84C221EEA8243BFD92FFE6896CDD1EA16ADD34E1E3D47D4A
+ auth:
{{ .Values.mso.so.operationalEnv.dmaap.auth }}
publisher:
topic: com.att.ecomp.mso.operationalEnvironmentEvent
health:
publisher:
topic: com.att.ecomp.mso.operationalEnvironmentEvent
health:
- auth:
Basic bXNvX2FkbWlufHBhc3N3b3JkMSQ=
+ auth:
{{ .Values.mso.health.auth }}
endpoints:
- subsystem: apih
uri: http://so-bpmn-infra:8081
- subsystem: catalogdb
uri: http://so-catalog-db-adapter:8082
endpoints:
- subsystem: apih
uri: http://so-bpmn-infra:8081
- subsystem: catalogdb
uri: http://so-catalog-db-adapter:8082
-
spring:
datasource:
hikari:
spring:
datasource:
hikari:
@@
-120,4
+123,4
@@
org:
cloud-owner: CloudOwner
adapters:
network:
cloud-owner: CloudOwner
adapters:
network:
- encryptionKey:
07a7159d3bf51a0e53be7a8f89699be7
+ encryptionKey:
{{ .Values.mso.msoKey }}