From: Borislav Glozman <Borislav.Glozman@amdocs.com>
Date: Tue, 29 May 2018 16:05:36 +0000 (+0000)
Subject: Merge "VNFSDK - revert back to embedded postgres"
X-Git-Tag: 2.0.0-ONAP~51
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7a1d526b8a1eab6cbb7cc45248b44c52d5979077;hp=613f4eb0c7a28a856bdd63c2776c355a3ad6be9b;p=oom.git

Merge "VNFSDK - revert back to embedded postgres"
---

diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml
index 751e4a0c11..5ecab2090f 100644
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@ -50,10 +50,10 @@ config:
         "clamp.config.files.sdcController": "file:/opt/clamp/sdc-controllers-config.json",
         "clamp.config.dcae.inventory.url": "http://inventory.{{ include "common.namespace" . }}:8080",
         "clamp.config.dcae.dispatcher.url": "http://deployment-handler.{{ include "common.namespace" . }}:8443",
-        "clamp.config.policy.pdpUrl1": "https://pdp.{{ include "common.namespace" . }}:9091/pdp/ , testpdp, alpha123",
-        "clamp.config.policy.pdpUrl2": "https://pdp.{{ include "common.namespace" . }}:9091/pdp/ , testpdp, alpha123",
-        "clamp.config.policy.papUrl": "https://pap.{{ include "common.namespace" . }}:8443/pap/ , testpap, alpha123",
-        "clamp.config.policy.clientKey": "5CE79532B3A2CB4D132FC0C04BF916A7"
+        "clamp.config.policy.pdpUrl1": "http://pdp.{{ include "common.namespace" . }}:8081/pdp/ , testpdp, alpha123",
+        "clamp.config.policy.pdpUrl2": "http://pdp.{{ include "common.namespace" . }}:8081/pdp/ , testpdp, alpha123",
+        "clamp.config.policy.papUrl": "http://pap.{{ include "common.namespace" . }}:9091/pap/ , testpap, alpha123",
+        "clamp.config.policy.clientKey": "dGVzdA=="
     }
 
 # subchart configuration
diff --git a/kubernetes/cli/values.yaml b/kubernetes/cli/values.yaml
index bd52ced25f..6bfd793979 100644
--- a/kubernetes/cli/values.yaml
+++ b/kubernetes/cli/values.yaml
@@ -25,7 +25,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/cli:2.0-STAGING-latest
+image: onap/cli:2.0.2
 pullPolicy: Always
 
 # application configuration