Merge "4.6.0 policy-handler active-passive"

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml
index 50ac16f..9cd37b5 100644 (file)
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml
@@ -31,6 +31,12 @@ application_config:
     policy_retry_count : 5
     policy_retry_sleep : 5
 
+    # mode of operation for the policy-handler
+    # either active or passive
+    # in passive mode the policy-hanlder will not listen to
+    #                 and will not bring the policy-updates from policy-engine
+    mode_of_operation : "active"
+
     # config of automatic catch_up for resiliency
     catch_up :
         # interval in seconds on how often to call automatic catch_up
@@ -77,7 +83,7 @@ application_config:
         # optional timeout_in_secs specifies the timeout for the http requests
         timeout_in_secs: 60
         # optional ws_ping_interval_in_secs specifies the ping interval for the web-socket connection
-        ws_ping_interval_in_secs: 180
+        ws_ping_interval_in_secs: 30
     # deploy_handler config
     #    changed from string "deployment_handler" in 2.3.1 to structure in 2.4.0
     deploy_handler :

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
index c444011..81119c5 100644 (file)
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
@@ -88,7 +88,7 @@ componentImages:
   deployment_handler: onap/org.onap.dcaegen2.platform.deployment-handler:3.1.0
   holmes_rules: onap/holmes/rule-management:1.2.3
   holmes_engine: onap/holmes/engine-management:1.2.2
-  policy_handler: onap/org.onap.dcaegen2.platform.policy-handler:4.5.0
+  policy_handler: onap/org.onap.dcaegen2.platform.policy-handler:4.6.0
   tca: onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0
   ves: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.3.1
   snmptrap: onap/org.onap.dcaegen2.collectors.snmptrap:1.4.0