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 "[AUTHENTICATION] Restructured keycloak and Oauth2-proxy"
[oom.git]
/
kubernetes
/
sdc
/
resources
/
config
/
environments
/
AUTO.json
diff --git
a/kubernetes/sdc/resources/config/environments/AUTO.json
b/kubernetes/sdc/resources/config/environments/AUTO.json
index
aee666f
..
59cb865
100755
(executable)
--- a/
kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/
kubernetes/sdc/resources/config/environments/AUTO.json
@@
-8,7
+8,7
@@
"chef_type": "environment",
"default_attributes": {
"chef_type": "environment",
"default_attributes": {
- "disableHttp":
{{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }}
,
+ "disableHttp":
false
,
"CS_VIP": "{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}",
"BE_VIP": "sdc-be.{{include "common.namespace" .}}",
"ONBOARDING_BE_VIP": "sdc-onboarding-be.{{include "common.namespace" .}}",
"CS_VIP": "{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}",
"BE_VIP": "sdc-be.{{include "common.namespace" .}}",
"ONBOARDING_BE_VIP": "sdc-onboarding-be.{{include "common.namespace" .}}",
@@
-19,7
+19,11
@@
},
"ECompP": {
"ecomp_rest_url": "https://portal-app.{{include "common.namespace" .}}:8443/ONAPPORTAL/auxapi",
},
"ECompP": {
"ecomp_rest_url": "https://portal-app.{{include "common.namespace" .}}:8443/ONAPPORTAL/auxapi",
+ {{- if .Values.global.kafka.useKafka }}
+ "ueb_url_list": "no-message-router.{{include "common.namespace" .}}, message-router.{{include "common.namespace" .}}",
+ {{- else }}
"ueb_url_list": "message-router.{{include "common.namespace" .}}, message-router.{{include "common.namespace" .}}",
"ueb_url_list": "message-router.{{include "common.namespace" .}}, message-router.{{include "common.namespace" .}}",
+ {{- end }}
"app_secret": "XftIATw9Jr3VzAcPqt3NnJOu",
"app_key": "x9UfO7JsDn8BESVX",
"inbox_name": "ECOMP-PORTAL-INBOX",
"app_secret": "XftIATw9Jr3VzAcPqt3NnJOu",
"app_key": "x9UfO7JsDn8BESVX",
"inbox_name": "ECOMP-PORTAL-INBOX",
@@
-31,17
+35,24
@@
"PublicKey": "iPIxkpAMI8qTcQj8",
"SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
"fqdn": [
"PublicKey": "iPIxkpAMI8qTcQj8",
"SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
"fqdn": [
+ {{- if .Values.global.kafka.useKafka }}
+ "no-message-router.{{include "common.namespace" .}}",
+ "no-message-router.{{include "common.namespace" .}}"
+ {{- else }}
"message-router.{{include "common.namespace" .}}",
"message-router.{{include "common.namespace" .}}"
"message-router.{{include "common.namespace" .}}",
"message-router.{{include "common.namespace" .}}"
+ {{- end }}
]
},
"Kafka": {
]
},
"Kafka": {
- "bootstrap": "{{ include "common.release" . }}-
{{ .Values.global.kafka.kafkaBootstrap }}
"
+ "bootstrap": "{{ include "common.release" . }}-
strimzi-kafka-bootstrap:9092
"
},
},
+ {{- if .Values.global.kafka.useKafka }}
"DistributionTopics": {
"notificationTopicName": "{{ .Values.global.kafka.topics.sdcDistNotifTopic }}",
"statusTopicName": "{{ .Values.global.kafka.topics.sdcDistStatusTopic }}"
},
"DistributionTopics": {
"notificationTopicName": "{{ .Values.global.kafka.topics.sdcDistNotifTopic }}",
"statusTopicName": "{{ .Values.global.kafka.topics.sdcDistStatusTopic }}"
},
+ {{- end }}
"Nodes": {
"CS": [
"{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}"
"Nodes": {
"CS": [
"{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}"
@@
-119,13
+130,6
@@
"username": "user1@sdc.com",
"password": "password=="
}
"username": "user1@sdc.com",
"password": "password=="
}
- {{- if .Values.global.aafEnabled }}
- },
- "jetty": {
- "keystore_pwd": "${KEYSTORE_PASS}",
- "truststore_pwd": "${TRUSTSTORE_PASS}",
- "keymanager_pwd": "${KEYMANAGER_PASS}"
- {{- end }}
}
}
}
}
}
}