x
/
fuel-plugin-elasticsearch-kibana
Code Issues Proposed changes

Merge "Set recover_after_time default value when using CLI"

This commit is contained in:
Jenkins 2016-07-05 14:19:46 +00:00 committed by Gerrit Code Review
parent dee30590e0 b2678fbca7
commit e5612d5f5d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deployment_scripts/puppet/manifests/hiera_override.pp
View File

@ -50,7 +50,14 @@ if is_integer($elasticsearch_kibana['minimum_master_nodes']) and $elasticsearch_
}
notice("Set minimum_master_nodes to ${minimum_master_nodes}")
$recover_after_time = 0 + $elasticsearch_kibana['recover_after_time']
if is_integer($elasticsearch_kibana['recover_after_time']) {
$recover_after_time = 0 + $elasticsearch_kibana['recover_after_time']
} else {
# Use the same default value as environment_config.yaml
# see #1593135
$recover_after_time = 5
notice("Set recover_after_time to ${recover_after_time}")
}
if is_integer($elasticsearch_kibana['recover_after_nodes']) and $elasticsearch_kibana['recover_after_nodes'] <= $es_nodes_count {
$recover_after_nodes = $elasticsearch_kibana['recover_after_nodes']