summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-10-26 08:57:51 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-10-26 08:57:51 -0400
commitb867a2b68ac7a44e82084ba1eff8e757145888d2 (patch)
tree53bdebfe6e1aede2c2d4ee50ce6cf506f6ffcb3b /roles/openshift_node
parentcf166a8f6a0b27406c7d6d307ec78793999fdf2d (diff)
parent48889b8ed74abfd070fb5ecad082c4f540f7a3fe (diff)
downloadopenshift-b867a2b68ac7a44e82084ba1eff8e757145888d2.tar.gz
openshift-b867a2b68ac7a44e82084ba1eff8e757145888d2.tar.bz2
openshift-b867a2b68ac7a44e82084ba1eff8e757145888d2.tar.xz
openshift-b867a2b68ac7a44e82084ba1eff8e757145888d2.zip
Merge pull request #729 from detiber/handlerRefactor
Avoid hardcoded 30s pauses
Diffstat (limited to 'roles/openshift_node')
-rw-r--r--roles/openshift_node/handlers/main.yml1
-rw-r--r--roles/openshift_node/tasks/main.yml5
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_node/handlers/main.yml b/roles/openshift_node/handlers/main.yml
index 633f3ed13..447ca85f3 100644
--- a/roles/openshift_node/handlers/main.yml
+++ b/roles/openshift_node/handlers/main.yml
@@ -1,6 +1,7 @@
---
- name: restart node
service: name={{ openshift.common.service_type }}-node state=restarted
+ when: not node_service_status_changed | default(false)
- name: restart docker
service: name=docker state=restarted
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index d45dd8073..a7d63befa 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -128,6 +128,5 @@
service: name={{ openshift.common.service_type }}-node enabled=yes state=started
register: start_result
-- name: pause to prevent service restart from interfering with bootstrapping
- pause: seconds=30
- when: start_result | changed
+- set_fact:
+ node_service_status_changed = start_result | changed