Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update config of policy/distribution chart
[oom.git]
/
kubernetes
/
policy
/
charts
/
policy-distribution
/
resources
/
config
/
config.json
diff --git
a/kubernetes/policy/charts/policy-distribution/resources/config/config.json
b/kubernetes/policy/charts/policy-distribution/resources/config/config.json
index
9062633
..
9b9a7a5
100644
(file)
--- a/
kubernetes/policy/charts/policy-distribution/resources/config/config.json
+++ b/
kubernetes/policy/charts/policy-distribution/resources/config/config.json
@@
-21,8
+21,8
@@
"restServerParameters":{
"host":"0.0.0.0",
"port":6969,
"restServerParameters":{
"host":"0.0.0.0",
"port":6969,
- "userName":"
healthcheck
",
- "password":"
zb!XztG34
",
+ "userName":"
${RESTSERVER_USER}
",
+ "password":"
${RESTSERVER_PASSWORD}
",
"https":true
},
"receptionHandlerParameters":{
"https":true
},
"receptionHandlerParameters":{
@@
-32,11
+32,6
@@
"receptionHandlerConfigurationName":"sdcConfiguration",
"pluginHandlerParameters":{
"policyDecoders":{
"receptionHandlerConfigurationName":"sdcConfiguration",
"pluginHandlerParameters":{
"policyDecoders":{
- "HpaDecoder":{
- "decoderType":"HpaDecoder",
- "decoderClassName":"org.onap.policy.distribution.reception.decoding.hpa.PolicyDecoderCsarHpa",
- "decoderConfigurationName": "csarToOptimizationPolicyConfiguration"
- },
"ToscaPolicyDecoder":{
"decoderType":"ToscaPolicyDecoder",
"decoderClassName":"org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicy",
"ToscaPolicyDecoder":{
"decoderType":"ToscaPolicyDecoder",
"decoderClassName":"org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicy",
@@
-61,8
+56,8
@@
"messageBusAddress": [
"message-router"
],
"messageBusAddress": [
"message-router"
],
- "user": "
policy
",
- "password": "
Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
",
+ "user": "
${SDCBE_USER}
",
+ "password": "
${SDCBE_PASSWORD}
",
"pollingInterval":20,
"pollingTimeout":30,
"consumerId": "policy-id",
"pollingInterval":20,
"pollingTimeout":30,
"consumerId": "policy-id",
@@
-81,17
+76,6
@@
}
},
"policyDecoderConfigurationParameters":{
}
},
"policyDecoderConfigurationParameters":{
- "csarToOptimizationPolicyConfiguration":{
- "parameterClassName": "org.onap.policy.distribution.reception.decoding.hpa.PolicyDecoderCsarHpaParameters",
- "parameters":{
- "policyNamePrefix": "oofCasablanca",
- "onapName": "OOF",
- "version": "1.0",
- "priority": "3",
- "riskType": "Test",
- "riskLevel": "2"
- }
- },
"toscaPolicyDecoderConfiguration":{
"parameterClassName":"org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicyParameterGroup",
"parameters":{
"toscaPolicyDecoderConfiguration":{
"parameterClassName":"org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicyParameterGroup",
"parameters":{
@@
-107,14
+91,14
@@
"apiParameters": {
"hostName": "policy-api",
"port": 6969,
"apiParameters": {
"hostName": "policy-api",
"port": 6969,
- "userName": "
healthcheck
",
- "password": "
zb!XztG34
"
+ "userName": "
${API_USER}
",
+ "password": "
${API_PASSWORD}
"
},
"papParameters": {
"hostName": "policy-pap",
"port": 6969,
},
"papParameters": {
"hostName": "policy-pap",
"port": 6969,
- "userName": "
healthcheck
",
- "password": "
zb!XztG34
"
+ "userName": "
${PAP_USER}
",
+ "password": "
${PAP_PASSWORD}
"
},
"isHttps": true,
"deployPolicies": true
},
"isHttps": true,
"deployPolicies": true