diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-10-21 16:00:06 -0400 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-10-22 11:13:14 -0400 |
| commit | 28060809e10c54bf2edd2f9bf2dd22ce5acfff0a (patch) | |
| tree | a7b9afda8c5cb4f9e025f0b2069b828292410150 | |
| parent | 917f8b157b10ee605cee75065fe874c5561a0573 (diff) | |
| download | openshift-28060809e10c54bf2edd2f9bf2dd22ce5acfff0a.tar.gz openshift-28060809e10c54bf2edd2f9bf2dd22ce5acfff0a.tar.bz2 openshift-28060809e10c54bf2edd2f9bf2dd22ce5acfff0a.tar.xz openshift-28060809e10c54bf2edd2f9bf2dd22ce5acfff0a.zip | |
Avoid hardcoded 30s pauses
- refactor node and master restart handlers to avoid 30s pauses
| -rw-r--r-- | roles/openshift_master/handlers/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_node/handlers/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 5 |
4 files changed, 6 insertions, 7 deletions
diff --git a/roles/openshift_master/handlers/main.yml b/roles/openshift_master/handlers/main.yml index 2981979e0..f00e56908 100644 --- a/roles/openshift_master/handlers/main.yml +++ b/roles/openshift_master/handlers/main.yml @@ -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)) diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 4dcab31d1..90e77e7c2 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -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 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 |