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 "[EXTAPI] Make NBI ServiceMesh compatible"
[oom.git]
/
kubernetes
/
policy
/
components
/
policy-apex-pdp
/
resources
/
config
/
OnapPfConfig.json
diff --git
a/kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json
b/kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json
index
767d145
..
7614a8c
100755
(executable)
--- a/
kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json
+++ b/
kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json
@@
-5,7
+5,8
@@
"port": 6969,
"userName": "${RESTSERVER_USER}",
"password": "${RESTSERVER_PASSWORD}",
"port": 6969,
"userName": "${RESTSERVER_USER}",
"password": "${RESTSERVER_PASSWORD}",
- "https": true
+ "https": {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }},
+ "prometheus": true
},
"pdpStatusParameters":{
"pdpGroup": "defaultGroup",
},
"pdpStatusParameters":{
"pdpGroup": "defaultGroup",
@@
-13,10
+14,6
@@
"pdpType":"apex",
"description":"Pdp Heartbeat",
"supportedPolicyTypes": [
"pdpType":"apex",
"description":"Pdp Heartbeat",
"supportedPolicyTypes": [
- {
- "name": "onap.policies.controlloop.operational.Apex",
- "version": "1.0.0"
- },
{
"name": "onap.policies.native.Apex",
"version": "1.0.0"
{
"name": "onap.policies.native.Apex",
"version": "1.0.0"
@@
-31,13
+28,14
@@
"topicSources" : [{
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
"topicSources" : [{
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
- "useHttps" : true,
+ "useHttps" : {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }},
+ "fetchTimeout": 15000,
"topicCommInfrastructure" : "dmaap"
}],
"topicSinks" : [{
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
"topicCommInfrastructure" : "dmaap"
}],
"topicSinks" : [{
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
- "useHttps" :
true
,
+ "useHttps" :
{{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }}
,
"topicCommInfrastructure" : "dmaap"
}]
}
"topicCommInfrastructure" : "dmaap"
}]
}