summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Venkatesh Kumar <vv770d@att.com>2019-04-08 16:32:58 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-08 16:32:58 +0000
commitf5564524a065321b1eb91b14dd3342acf85bfe62 (patch)
tree44aae98c0d8c23d131cc919a489a6084adef5cb0
parent66206077797318250df919425bc6d19ebb2c581f (diff)
parent30d02e82c80f215fadbedd1a452e4d3eb2a0cf52 (diff)
Merge "config for 5.0.0 policy-handler new PDP API"
-rw-r--r--bootstrap/README-docker.md1
-rwxr-xr-xheat/register.sh14
2 files changed, 7 insertions, 8 deletions
diff --git a/bootstrap/README-docker.md b/bootstrap/README-docker.md
index d60afe2..7e3dedc 100644
--- a/bootstrap/README-docker.md
+++ b/bootstrap/README-docker.md
@@ -107,6 +107,7 @@ application_config:
# related to policy-engine itself.
policy_engine :
url : "https://policy-engine.onap.org:8081"
+ path_decision : "/decision/v1"
path_pdp : "/pdp/"
path_api : "/pdp/api/"
headers :
diff --git a/heat/register.sh b/heat/register.sh
index 6843fa4..34c1505 100755
--- a/heat/register.sh
+++ b/heat/register.sh
@@ -238,6 +238,7 @@ REGKV='
"interval": 600
},
"policy_engine": {
+ "path_decision": "/decision/v1",
"path_api": "/pdp/api/",
"path_notifications" : "/pdp/notifications",
"tls_ca_mode" : "cert_directory",
@@ -249,11 +250,8 @@ REGKV='
"Accept": "application/json",
"Authorization": "Basic dGVzdHBkcDphbHBoYTEyMw=="
},
- "path_pdp": "/pdp/",
"url": "https://{{ policy_ip_addr }}:8081",
- "target_entity": "policy_engine",
- "tls_wss_ca_mode": "do_not_verify",
- "tls_ca_mode": "do_not_verify"
+ "target_entity": "policy_engine"
}
}
}'
@@ -527,12 +525,12 @@ curl -v -X PUT -H "Content-Type: application/json" \
-# hv-ves collector
+# hv-ves collector
SERVICENAME="${SRVCNAME_STATIC_HVVES}"
-REGKV='{
- "dmaap.kafkaBootstrapServers": "{{ mr_ip_addr }}:9092",
+REGKV='{
+ "dmaap.kafkaBootstrapServers": "{{ mr_ip_addr }}:9092",
"collector.routing": {
- "fromDomain": "HVMEAS",
+ "fromDomain": "HVMEAS",
"toTopic": "HV_VES_MEASUREMENTS"
}
}'