diff options
author | Diego Castro <spinolacastro@gmail.com> | 2015-08-15 16:37:48 -0300 |
---|---|---|
committer | Diego Castro <spinolacastro@gmail.com> | 2015-08-15 16:37:48 -0300 |
commit | e7925364342c9a324d91e750ba56aa41ad789419 (patch) | |
tree | 289116d3a701ad67730794f8bcf7d71dbdc657f4 /roles/fluentd_master | |
parent | 1d764a0bebbbb12e3c3142c59b10fae34c8b7211 (diff) | |
parent | 30d653aa5b776afbf35c98b1b5e7436f8cb7123c (diff) | |
download | openshift-e7925364342c9a324d91e750ba56aa41ad789419.tar.gz openshift-e7925364342c9a324d91e750ba56aa41ad789419.tar.bz2 openshift-e7925364342c9a324d91e750ba56aa41ad789419.tar.xz openshift-e7925364342c9a324d91e750ba56aa41ad789419.zip |
Merge remote-tracking branch 'openshift/master' into project_config
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: |