- refactor node and master restart handlers to avoid 30s pauses
@@ -1,4 +1,4 @@
---
- name: restart master
service: name={{ openshift.common.service_type }}-master state=restarted
- when: not openshift_master_ha | bool
+ when: not (openshift_master_ha | bool or skip_master_restart | default(false))
@@ -155,9 +155,8 @@
when: not openshift_master_ha | bool
register: start_result
-- name: pause to prevent service restart from interfering with bootstrapping
- pause: seconds=30
- when: start_result | changed
+- set_fact:
+ skip_master_restart = start_result | changed
- name: Install cluster packages
yum: pkg=pcs state=present
@@ -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
@@ -128,6 +128,5 @@
service: name={{ openshift.common.service_type }}-node enabled=yes state=started
+ skip_node_restart = start_result | changed