diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-10-26 08:57:51 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-10-26 08:57:51 -0400 |
| commit | b867a2b68ac7a44e82084ba1eff8e757145888d2 (patch) | |
| tree | 53bdebfe6e1aede2c2d4ee50ce6cf506f6ffcb3b | |
| parent | cf166a8f6a0b27406c7d6d307ec78793999fdf2d (diff) | |
| parent | 48889b8ed74abfd070fb5ecad082c4f540f7a3fe (diff) | |
| download | openshift-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
| -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..37028e0f6 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) and (not master_service_status_changed | default(false)) diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index a5c1a805c..fca41307d 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -141,9 +141,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: + master_service_status_changed = 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..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 |