summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-01-18 09:47:05 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-01-18 09:47:05 -0500
commit03ab833e0107990017306dca04e094e1de5a39fb (patch)
tree6a5bca9a02f20de96c7abf5d51a657eb73332463 /roles
parentf1fd5a7a198703cc26dcc4efc5a4cc6eed3717b7 (diff)
parentc468a080c78de8bc2ef67d4d1647792fdd4e566c (diff)
downloadopenshift-03ab833e0107990017306dca04e094e1de5a39fb.tar.gz
openshift-03ab833e0107990017306dca04e094e1de5a39fb.tar.bz2
openshift-03ab833e0107990017306dca04e094e1de5a39fb.tar.xz
openshift-03ab833e0107990017306dca04e094e1de5a39fb.zip
Merge pull request #1194 from abutcher/haproxy-restart
Remove pause after haproxy start
Diffstat (limited to 'roles')
-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 }}"