diff options
| author | Matt Woodson <mwoodson@gmail.com> | 2016-01-18 15:08:03 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@gmail.com> | 2016-01-18 15:08:03 -0500 |
| commit | 3bed4d0c4bda1b6332ec547502663d09e98b89d1 (patch) | |
| tree | f64e0d0c7e9bc06a76d727050047053cf1a30a6a /roles/haproxy | |
| parent | 0bbfef4e1951db1f19135e532f78fe12cab6d4fc (diff) | |
| parent | ee3aec770b6b1a2b0212b432a920e3d846e56044 (diff) | |
| download | openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.tar.gz openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.tar.bz2 openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.tar.xz openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.zip | |
Merge pull request #1214 from openshift/master
Merge master into prod
Diffstat (limited to 'roles/haproxy')
| -rw-r--r-- | roles/haproxy/handlers/main.yml | 1 | ||||
| -rw-r--r-- | roles/haproxy/tasks/main.yml | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/haproxy/handlers/main.yml b/roles/haproxy/handlers/main.yml index ee60adcab..5b8691b26 100644 --- a/roles/haproxy/handlers/main.yml +++ b/roles/haproxy/handlers/main.yml @@ -3,3 +3,4 @@ service: name: haproxy state: restarted + when: not (haproxy_start_result_changed | default(false) | bool) diff --git a/roles/haproxy/tasks/main.yml b/roles/haproxy/tasks/main.yml index 97f870829..0b8370ce2 100644 --- a/roles/haproxy/tasks/main.yml +++ b/roles/haproxy/tasks/main.yml @@ -19,6 +19,5 @@ enabled: yes register: start_result -- name: Pause 30 seconds if haproxy was just started - pause: seconds=30 - when: start_result | changed +- set_fact: + haproxy_start_result_changed: "{{ start_result | changed }}" |