From 28060809e10c54bf2edd2f9bf2dd22ce5acfff0a Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Wed, 21 Oct 2015 16:00:06 -0400
Subject: Avoid hardcoded 30s pauses
- refactor node and master restart handlers to avoid 30s pauses
---
roles/openshift_node/handlers/main.yml | 1 +
roles/openshift_node/tasks/main.yml | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'roles/openshift_node')
diff --git a/roles/openshift_node/handlers/main.yml b/roles/openshift_node/handlers/main.yml
index 633f3ed13..5638a23c1 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 skip_node_restart | 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..a6e8747a3 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:
+ skip_node_restart = start_result | changed
--
cgit v1.2.3