summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefanie Forrester <chloe.tara@gmail.com>2015-08-13 13:39:55 -0700
committerStefanie Forrester <chloe.tara@gmail.com>2015-08-13 13:39:55 -0700
commit2cbba20205318b3c16b7aa8cd2693e2838c547c1 (patch)
treebccf87f89d209621dbeebfdb1f281a70099fc8fa
parent1399425c70052445cc8659fd12cd19535fb95e5a (diff)
parent089d368d2976818d08c656f45711e25e70cf7a35 (diff)
downloadopenshift-2cbba20205318b3c16b7aa8cd2693e2838c547c1.tar.gz
openshift-2cbba20205318b3c16b7aa8cd2693e2838c547c1.tar.bz2
openshift-2cbba20205318b3c16b7aa8cd2693e2838c547c1.tar.xz
openshift-2cbba20205318b3c16b7aa8cd2693e2838c547c1.zip
Merge pull request #464 from dak1n1/fix_pause
pause for a minimum of 15 seconds
-rw-r--r--roles/fluentd_master/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/fluentd_master/tasks/main.yml b/roles/fluentd_master/tasks/main.yml
index d64900eb0..d592dc306 100644
--- a/roles/fluentd_master/tasks/main.yml
+++ b/roles/fluentd_master/tasks/main.yml
@@ -40,7 +40,7 @@
mode: 0444
- name: "Pause before restarting td-agent and openshift-master, depending on the number of nodes."
- pause: seconds={{ num_nodes|int * 5 }}
+ pause: seconds={{ ( num_nodes|int < 3 ) | ternary(15, (num_nodes|int * 5)) }}
- name: ensure td-agent is running
service: