diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-05 15:42:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 15:42:20 -0500 |
| commit | b879f67881b1abcc8f614e1e6ca1b5cdc2cc2649 (patch) | |
| tree | d8ea0b2afe7df6c400160c7b2f3870f9e44bc6a8 /roles/nuage_master | |
| parent | 968f614e984da91a4e883a9642af8e66d49d87a0 (diff) | |
| parent | 259272fa2359fd4d3bd78291bd0b06a1261c4b01 (diff) | |
| download | openshift-b879f67881b1abcc8f614e1e6ca1b5cdc2cc2649.tar.gz openshift-b879f67881b1abcc8f614e1e6ca1b5cdc2cc2649.tar.bz2 openshift-b879f67881b1abcc8f614e1e6ca1b5cdc2cc2649.tar.xz openshift-b879f67881b1abcc8f614e1e6ca1b5cdc2cc2649.zip | |
Merge pull request #6155 from abutcher/remove-pacemaker
Remove all references to pacemaker (pcs, pcsd) and openshift.master.cluster_method.
Diffstat (limited to 'roles/nuage_master')
| -rw-r--r-- | roles/nuage_master/handlers/main.yaml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/roles/nuage_master/handlers/main.yaml b/roles/nuage_master/handlers/main.yaml index 410b739e9..cb83c8ead 100644 --- a/roles/nuage_master/handlers/main.yaml +++ b/roles/nuage_master/handlers/main.yaml @@ -3,8 +3,7 @@ systemd: name={{ openshift.common.service_type }}-master-api state=restarted when: > (openshift_master_ha | bool) and - (not master_api_service_status_changed | default(false)) and - openshift.master.cluster_method == 'native' + (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. @@ -16,6 +15,5 @@ until: result.rc == 0 when: > (openshift_master_ha | bool) and - (not master_controllers_service_status_changed | default(false)) and - openshift.master.cluster_method == 'native' + (not master_controllers_service_status_changed | default(false)) ignore_errors: yes |