From: Yang Xu <yang.xu3@huawei.com>
Date: Thu, 9 May 2019 20:24:30 +0000 (+0000)
Subject: Merge "Update tag and PH config"
X-Git-Tag: 4.0.0-ONAP~124
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fe7ca7ab634a95baa57e034679c40ed61f765620;hp=2eb728002adb638a08c6e8faacf8d41f003a8805;p=oom.git

Merge "Update tag and PH config"
---

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
index 0dc99193eb..6c5bb9a3bd 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
@@ -90,7 +90,7 @@ postgres:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.15
+image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.16
 default_k8s_location: central
 
 # DCAE component images to be deployed via Cloudify Manager
diff --git a/kubernetes/dcaegen2/charts/dcae-policy-handler/resources/config/config.json b/kubernetes/dcaegen2/charts/dcae-policy-handler/resources/config/config.json
index 74abbb0664..1db11ad476 100644
--- a/kubernetes/dcaegen2/charts/dcae-policy-handler/resources/config/config.json
+++ b/kubernetes/dcaegen2/charts/dcae-policy-handler/resources/config/config.json
@@ -11,15 +11,15 @@
       "interval": 600
     },
     "policy_engine": {
-      "url": "https://{{ .Values.config.address.policy_pdp }}.{{include "common.namespace" . }}:8081",
-      "path_decision": "/decision/v1",
+      "url": "https://{{ .Values.config.address.policy_xacml_pdp }}:6969",
+      "path_decision": "/policy/pdpx/v1/decision"
       "path_notifications": "/pdp/notifications",
       "path_api": "/pdp/api/",
       "headers": {
         "Accept": "application/json",
         "Content-Type": "application/json",
         "ClientAuth": "cHl0aG9uOnRlc3Q=",
-        "Authorization": "Basic dGVzdHBkcDphbHBoYTEyMw==",
+        "Authorization": "Basic aGVhbHRoY2hlY2s6emIhWHp0RzM0",
         "Environment": "TEST"
       },
       "target_entity": "policy_engine",
diff --git a/kubernetes/dcaegen2/charts/dcae-policy-handler/values.yaml b/kubernetes/dcaegen2/charts/dcae-policy-handler/values.yaml
index fa52f6f784..3b15c55118 100644
--- a/kubernetes/dcaegen2/charts/dcae-policy-handler/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-policy-handler/values.yaml
@@ -40,6 +40,7 @@ config:
     consul:
       host: consul-server
       port: 8500
+    policy_xacml_pdp: policy-xacml-pdp
 
 #################################################################
 # Application configuration defaults.