From 7ad80890bef51663fc970187ad4a15c54c201196 Mon Sep 17 00:00:00 2001
From: ramverma <ram.krishna.verma@est.tech>
Date: Fri, 30 Aug 2019 14:55:47 +0100
Subject: Update policy/distribution config & image version

Updating the config file of distribution chart as per the new code
changes done in El Alto release.
Adding changes for policy-engine as well.

Issue-ID: POLICY-1892
Change-Id: I21d971ff76f06dd1d74884481c81801422a3971c
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
---
 kubernetes/policy/charts/brmsgw/values.yaml        |  2 +-
 kubernetes/policy/charts/pdp/values.yaml           |  2 +-
 .../resources/config/config.json                   | 28 ++++++++++++++++++++--
 .../policy/charts/policy-distribution/values.yaml  |  2 +-
 4 files changed, 29 insertions(+), 5 deletions(-)

(limited to 'kubernetes/policy')

diff --git a/kubernetes/policy/charts/brmsgw/values.yaml b/kubernetes/policy/charts/brmsgw/values.yaml
index 57ff2f4b49..ef817f0be6 100644
--- a/kubernetes/policy/charts/brmsgw/values.yaml
+++ b/kubernetes/policy/charts/brmsgw/values.yaml
@@ -26,7 +26,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-pe:1.5.1
+image: onap/policy-pe:1.5.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/charts/pdp/values.yaml b/kubernetes/policy/charts/pdp/values.yaml
index 07f1794bd2..20f4614b07 100644
--- a/kubernetes/policy/charts/pdp/values.yaml
+++ b/kubernetes/policy/charts/pdp/values.yaml
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-pe:1.5.1
+image: onap/policy-pe:1.5.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/charts/policy-distribution/resources/config/config.json b/kubernetes/policy/charts/policy-distribution/resources/config/config.json
index 5591e58e32..5e1c80f80a 100644
--- a/kubernetes/policy/charts/policy-distribution/resources/config/config.json
+++ b/kubernetes/policy/charts/policy-distribution/resources/config/config.json
@@ -52,6 +52,11 @@
                         "forwarderType":"ApexForwarder",
                         "forwarderClassName":"org.onap.policy.distribution.forwarding.apex.pdp.ApexPdpPolicyForwarder",
                         "forwarderConfigurationName": "apexForwarderConfiguration"
+                    },
+                    "LifeCycleApiForwarder":{
+                        "forwarderType":"LifeCycleAPI",
+                        "forwarderClassName":"org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiPolicyForwarder",
+                        "forwarderConfigurationName": "lifecycleApiConfiguration"
                     }
                 }
             }
@@ -99,8 +104,8 @@
         "apexDecoderConfiguration":{
             "parameterClassName":"org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicyParameterGroup",
             "parameters":{
-                "policyFileName": "SamplePolicyModelJAVASCRIPT",
-                "policyType": "APEX"
+                "policyFileName": "apex_policy",
+                "policyTypeFileName": "apex_policy_type"
             }
         }
     },
@@ -126,6 +131,25 @@
                 "ignoreConflicts": true,
                 "forceUpdate": true
             }
+        },
+        "lifecycleApiConfiguration":{
+            "parameterClassName":"org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiForwarderParameters",
+            "parameters":{
+                "apiParameters": {
+                "hostName": "policy-api",
+                "port": 6969,
+                  "userName": "healthcheck",
+                  "password": "zb!XztG34"
+                 },
+                "papParameters": {
+                  "hostName": "policy-pap",
+                  "port": 6969,
+                 "userName": "healthcheck",
+                "password": "zb!XztG34"
+                },
+                "isHttps": true,
+                "deployPolicies": true
+             }
         }
     }
 }
diff --git a/kubernetes/policy/charts/policy-distribution/values.yaml b/kubernetes/policy/charts/policy-distribution/values.yaml
index 2cc0d444d6..04257a4725 100644
--- a/kubernetes/policy/charts/policy-distribution/values.yaml
+++ b/kubernetes/policy/charts/policy-distribution/values.yaml
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-distribution:2.2.0
+image: onap/policy-distribution:2.2.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
-- 
cgit 1.2.3-korg