summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-01-15 15:34:26 -0500
committerAndrew Butcher <abutcher@redhat.com>2016-01-15 15:36:38 -0500
commitc468a080c78de8bc2ef67d4d1647792fdd4e566c (patch)
treec447d22d1e660f9c504e1a380487b9ae92d033e4
parentbb1f8aa029078238cf32b038c8bffacb13c3765e (diff)
downloadopenshift-c468a080c78de8bc2ef67d4d1647792fdd4e566c.tar.gz
openshift-c468a080c78de8bc2ef67d4d1647792fdd4e566c.tar.bz2
openshift-c468a080c78de8bc2ef67d4d1647792fdd4e566c.tar.xz
openshift-c468a080c78de8bc2ef67d4d1647792fdd4e566c.zip
Remove pause after haproxy start
-rw-r--r--roles/haproxy/handlers/main.yml1
-rw-r--r--roles/haproxy/tasks/main.yml5
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 }}"