diff options
| author |   Michael Hwang <mhwang@research.att.com> | 2018-12-12 16:00:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-12-12 16:00:11 +0000 |
| commit | fc472cb8e6a8f1c1940336e917745bbe274d86f0 (patch) | |
| tree | de3ec46ce7102d21076fdb521f9f6ebdee385189 | |
| parent | fe292d667026f104ddd4d704df0d22c034ab3717 (diff) | |
| parent | 4410ba93ca42b9550a6368c01b63c1442a24ad44 (diff) | |
Merge "blueprint for 4.5.0 policy-handler"
| -rw-r--r-- | blueprints/k8s-policy_handler.yaml-template | 2 | ||||
| -rw-r--r-- | blueprints/policy_handler.yaml-template | 2 | ||||
| -rw-r--r-- | input-templates/phinputs.yaml | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/blueprints/k8s-policy_handler.yaml-template b/blueprints/k8s-policy_handler.yaml-template index b6c5f9e..0e37734 100644 --- a/blueprints/k8s-policy_handler.yaml-template +++ b/blueprints/k8s-policy_handler.yaml-template @@ -32,7 +32,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:4.4.0' + default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:4.5.0' application_config: description: policy handler application configuration - requires info on policy-engine diff --git a/blueprints/policy_handler.yaml-template b/blueprints/policy_handler.yaml-template index 48302c4..c9d09b3 100644 --- a/blueprints/policy_handler.yaml-template +++ b/blueprints/policy_handler.yaml-template @@ -39,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:4.4.0' + default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:4.5.0' application_config: description: policy handler application configuration - requires info on policy-engine diff --git a/input-templates/phinputs.yaml b/input-templates/phinputs.yaml index 50b90b2..89a3de5 100644 --- a/input-templates/phinputs.yaml +++ b/input-templates/phinputs.yaml @@ -68,6 +68,10 @@ application_config: tls_ca_mode : "cert_directory" # optional tls_wss_ca_mode specifies the same for the tls based web-socket tls_wss_ca_mode : "cert_directory" + # 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 # deploy_handler config # changed from string "deployment_handler" in 2.3.1 to structure in 2.4.0 deploy_handler : @@ -93,3 +97,5 @@ application_config: # # "do_not_verify" - special hack to turn off the verification by cacert and hostname tls_ca_mode : "cert_directory" + # optional timeout_in_secs specifies the timeout for the http requests + timeout_in_secs: 60 |