diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-12-13 13:04:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-12-13 13:04:28 +0000 |
| commit | 4db4c24c5e0ce2cb68527e2ddc4997e127983e5d (patch) | |
| tree | b5d9313887f96358379c09a4ae6bbc1df997f15c /kubernetes/dcaegen2 | |
| parent | 7a892478f3b6dfdd1cb25bb8c44c44c858088b1e (diff) | |
| parent | 473e153fc2c205af48fa1c7be13f7a96ab4afe47 (diff) | |
Merge "3.1.0-deployment-handler 4.5.0-policy-handler"
Diffstat (limited to 'kubernetes/dcaegen2')
| -rw-r--r-- | kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml | 7 | ||||
| -rw-r--r-- | kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml | 4 |
2 files changed, 8 insertions, 3 deletions
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 50da2cc49c..50ac16ffc9 100644 --- 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 @@ -74,6 +74,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 : @@ -99,4 +103,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 diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml index 6cf2cb64a6..cf80239ac4 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml @@ -86,11 +86,11 @@ image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.5 componentImages: config_binding_service: onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.3 datafile_collector: onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.1.0 - deployment_handler: onap/org.onap.dcaegen2.platform.deployment-handler:3.0.3 + 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 inventory: onap/org.onap.dcaegen2.platform.inventory-api:3.0.4 - policy_handler: onap/org.onap.dcaegen2.platform.policy-handler:4.4.0 + policy_handler: onap/org.onap.dcaegen2.platform.policy-handler:4.5.0 service_change_handler: onap/org.onap.dcaegen2.platform.servicechange-handler:1.1.5 tca: onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0 ves: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.3.1 |