diff options
author | Diego Castro <spinolacastro@gmail.com> | 2015-08-22 18:10:17 -0300 |
---|---|---|
committer | Diego Castro <spinolacastro@gmail.com> | 2015-08-22 18:10:17 -0300 |
commit | 055921cd545c12733949f37c1af2c0a1296216ec (patch) | |
tree | 0ad645b9a75eacbb168c9fdc92d585867b5317a4 /roles/fluentd_master | |
parent | 10b8c46d02d1ec9f4edf3df4b60e3bf533e73533 (diff) | |
parent | 922b87ede66f6b7e376d1f46e13327077cd41719 (diff) | |
download | openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.gz openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.bz2 openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.xz openshift-055921cd545c12733949f37c1af2c0a1296216ec.zip |
Merge remote-tracking branch 'openshift/master'
Diffstat (limited to 'roles/fluentd_master')
-rw-r--r-- | roles/fluentd_master/tasks/main.yml | 2 |
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: |