From b2678fbca7c207ef443408915df37ce8d70de546 Mon Sep 17 00:00:00 2001 From: Swann Croiset Date: Mon, 4 Jul 2016 15:43:36 +0200 Subject: [PATCH] Set recover_after_time default value when using CLI Change-Id: Icb6e1ffd43363070100705a05fea80d65b316798 Closes-bug: #1593135 --- deployment_scripts/puppet/manifests/hiera_override.pp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/deployment_scripts/puppet/manifests/hiera_override.pp b/deployment_scripts/puppet/manifests/hiera_override.pp index 316ff9b..2db6885 100644 --- a/deployment_scripts/puppet/manifests/hiera_override.pp +++ b/deployment_scripts/puppet/manifests/hiera_override.pp @@ -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']