Merge "blueprints version update policy-handler 2.3.1"

3 files changed, 26 insertions, 15 deletions

diff --git a/blueprints/DeploymentHandler.yaml-template b/blueprints/DeploymentHandler.yaml-template
index 4a8bb0c..8fa8799 100644
--- a/blueprints/DeploymentHandler.yaml-template
+++ b/blueprints/DeploymentHandler.yaml-template
@@ -18,7 +18,7 @@
 # limitations under the License.
 # ============LICENSE_END============================================
 #
-# ECOMP and OpenECOMP are trademarks 
+# ECOMP and OpenECOMP are trademarks
 # and service marks of AT&T Intellectual Property.
 #
 
@@ -37,19 +37,19 @@ inputs:
 
   location_id:
     description: Deployment location
-    
+
   docker_host_override:
     description: Target docker host
     default: 'platform_dockerhost'
-    
+
   deployment_handler_image:
     description: Docker image for deployment handler
-    default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.deployment-handler:v1.1.0'
-    
+    default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.deployment-handler:v2.0.2'
+
   application_config:
     description: deployment handler application configuration (to override defaults)
     default: {}
-    
+
   host_log_root:
     description: root directory for logs in the Docker host file system
     default: '/opt/onap/log'
@@ -91,7 +91,7 @@ node_templates:
                 #container:
                   #bind: /opt/app/dh/log
                   #mode: rw
-  
+
   # Docker host
   docker_host:
     type: dcae.nodes.SelectedDockerHost
diff --git a/blueprints/policy_handler.yaml-template b/blueprints/policy_handler.yaml-template
index 0c383fb..6b53a4a 100644
--- a/blueprints/policy_handler.yaml-template
+++ b/blueprints/policy_handler.yaml-template
@@ -1,9 +1,7 @@
 # -*- indent-tabs-mode: nil -*- # vi: set expandtab:
 #
 # ============LICENSE_START=======================================================
-# org.onap.dcae
-# ================================================================================
-# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,7 +25,7 @@ description: >
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/dockerplugin/2/dockerplugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/dockerplugin/3/dockerplugin_types.yaml
   - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/relationshipplugin/1/relationshipplugin_types.yaml
 
 inputs:
@@ -41,7 +39,7 @@ inputs:
 
   policy_handler_image:
     description: Docker image for policy_handler
-    default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:v2.1.0'
+    default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:v2.3.1'
 
   application_config:
     description: policy handler application configuration - requires info on policy-engine
diff --git a/blueprints/policy_handler_sample_app_config.yaml b/blueprints/policy_handler_sample_app_config.yaml
index acfc645..268df6f 100644
--- a/blueprints/policy_handler_sample_app_config.yaml
+++ b/blueprints/policy_handler_sample_app_config.yaml
@@ -1,9 +1,7 @@
 # -*- indent-tabs-mode: nil -*- # vi: set expandtab:
 #
 # ============LICENSE_START=======================================================
-# org.onap.dcae
-# ================================================================================
-# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,6 +35,21 @@ application_config:
     policy_retry_count : 5
     policy_retry_sleep : 5
 
+    # config of automatic catch_up for resiliency
+    catch_up :
+        # interval in seconds on how often to call automatic catch_up
+        # example: 1200 is 20*60 seconds that is 20 minutes
+        interval : 1200
+        # max_skips is the maximal number of times the auto catch_up can be skipped
+        # to reduce sending of identically the same messages to the deployment-handler
+        # example: if nothing changes in policy-engine
+        #          the policy-handler will still send the identicall cathc_up message
+        #          to deployment handler roughly every (max_skips + 1) * interval seconds
+        #          instead of sending the changed message every interval seconds
+        # in this case of max_skips = 5 the catch_up message will be sent
+        #          roughly every 2 hours = (5+1) * 1200 = 6 * 20 * 60 seconds = 2 * 60 * 60
+        max_skips : 5
+
     # policy-engine config
     # These are the url of and the auth for the external system, namely the policy-engine (PDP).
     # We obtain that info manually from PDP folks at the moment.