diff options
| author | Michael Gugino <mgugino@redhat.com> | 2018-01-25 13:25:49 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2018-01-25 13:25:49 -0500 |
| commit | 4f7d963986a1e28ecc6abd15532b0c1aece99be1 (patch) | |
| tree | 6b405ee61567f27344f37ee6be6a01097cbab8da /roles | |
| parent | 6c921b0877c38c2a6e55cd5852a740ec88fde8fb (diff) | |
| download | openshift-4f7d963986a1e28ecc6abd15532b0c1aece99be1.tar.gz openshift-4f7d963986a1e28ecc6abd15532b0c1aece99be1.tar.bz2 openshift-4f7d963986a1e28ecc6abd15532b0c1aece99be1.tar.xz openshift-4f7d963986a1e28ecc6abd15532b0c1aece99be1.zip | |
Remove master_ha bool checks
Most of these checks are no longer applicable to
the tasks on which they are applied.
This commit removes incorrect ha checks to ensure
services are restarted at appropriate times.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1500897
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/nuage_master/handlers/main.yaml | 8 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/restart.yml | 17 |
3 files changed, 10 insertions, 17 deletions
diff --git a/roles/nuage_master/handlers/main.yaml b/roles/nuage_master/handlers/main.yaml index 7b55dda56..c0411d641 100644 --- a/roles/nuage_master/handlers/main.yaml +++ b/roles/nuage_master/handlers/main.yaml @@ -1,9 +1,7 @@ --- - name: restart master api systemd: name={{ openshift_service_type }}-master-api state=restarted - when: > - (openshift_master_ha | bool) and - (not master_api_service_status_changed | default(false)) + when: (not master_api_service_status_changed | default(false)) # TODO: need to fix up ignore_errors here # We retry the controllers because the API may not be 100% initialized yet. @@ -13,7 +11,5 @@ delay: 5 register: result until: result.rc == 0 - when: > - (openshift_master_ha | bool) and - (not master_controllers_service_status_changed | default(false)) + when: (not master_controllers_service_status_changed | default(false)) ignore_errors: yes diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index b12a6b346..41f2ee2a5 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -227,7 +227,7 @@ - pause: seconds: 15 when: - - openshift.master.ha | bool + - openshift_master_ha | bool - name: Start and enable master api all masters systemd: diff --git a/roles/openshift_master/tasks/restart.yml b/roles/openshift_master/tasks/restart.yml index 715347101..f7697067a 100644 --- a/roles/openshift_master/tasks/restart.yml +++ b/roles/openshift_master/tasks/restart.yml @@ -3,7 +3,6 @@ service: name: "{{ openshift_service_type }}-master-api" state: restarted - when: openshift_master_ha | bool - name: Wait for master API to come back online wait_for: host: "{{ openshift.common.hostname }}" @@ -11,12 +10,10 @@ delay: 10 port: "{{ openshift.master.api_port }}" timeout: 600 - when: openshift_master_ha | bool -- name: Restart master controllers - service: - name: "{{ openshift_service_type }}-master-controllers" - state: restarted - # Ignore errrors since it is possible that type != simple for - # pre-3.1.1 installations. - ignore_errors: true - when: openshift_master_ha | bool +# We retry the controllers because the API may not be 100% initialized yet. +- name: restart master controllers + command: "systemctl restart {{ openshift_service_type }}-master-controllers" + retries: 3 + delay: 5 + register: result + until: result.rc == 0 |