diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2017-11-16 15:49:17 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-12-05 14:02:23 -0500 |
| commit | 259272fa2359fd4d3bd78291bd0b06a1261c4b01 (patch) | |
| tree | d8ea0b2afe7df6c400160c7b2f3870f9e44bc6a8 /playbooks/openshift-master | |
| parent | 968f614e984da91a4e883a9642af8e66d49d87a0 (diff) | |
| download | openshift-259272fa2359fd4d3bd78291bd0b06a1261c4b01.tar.gz openshift-259272fa2359fd4d3bd78291bd0b06a1261c4b01.tar.bz2 openshift-259272fa2359fd4d3bd78291bd0b06a1261c4b01.tar.xz openshift-259272fa2359fd4d3bd78291bd0b06a1261c4b01.zip | |
Remove all references to pacemaker (pcs, pcsd) and openshift.master.cluster_method.
With pacemaker removed there is no longer a need for
openshift.master.cluster_method. We only have one option.
Diffstat (limited to 'playbooks/openshift-master')
3 files changed, 0 insertions, 7 deletions
diff --git a/playbooks/openshift-master/private/additional_config.yml b/playbooks/openshift-master/private/additional_config.yml index b7cfbe4e4..a90cd6b22 100644 --- a/playbooks/openshift-master/private/additional_config.yml +++ b/playbooks/openshift-master/private/additional_config.yml @@ -19,8 +19,6 @@ openshift_master_ha: "{{ groups.oo_masters | length > 1 }}" omc_cluster_hosts: "{{ groups.oo_masters | join(' ')}}" roles: - - role: openshift_master_cluster - when: openshift_master_ha | bool and openshift.master.cluster_method == "pacemaker" - role: openshift_project_request_template when: openshift_project_request_template_manage - role: openshift_examples diff --git a/playbooks/openshift-master/private/tasks/wire_aggregator.yml b/playbooks/openshift-master/private/tasks/wire_aggregator.yml index 97acc5d5d..ecf8f15d9 100644 --- a/playbooks/openshift-master/private/tasks/wire_aggregator.yml +++ b/playbooks/openshift-master/private/tasks/wire_aggregator.yml @@ -183,7 +183,6 @@ systemd: name={{ openshift.common.service_type }}-master-api state=restarted when: - yedit_output.changed - - openshift.master.cluster_method == 'native' # We retry the controllers because the API may not be 100% initialized yet. - name: restart master controllers @@ -194,7 +193,6 @@ until: result.rc == 0 when: - yedit_output.changed - - openshift.master.cluster_method == 'native' - name: Verify API Server # Using curl here since the uri module requires python-httplib2 and diff --git a/playbooks/openshift-master/private/validate_restart.yml b/playbooks/openshift-master/private/validate_restart.yml index 5dbb21502..1077d0b9c 100644 --- a/playbooks/openshift-master/private/validate_restart.yml +++ b/playbooks/openshift-master/private/validate_restart.yml @@ -14,9 +14,6 @@ - role: common local_facts: rolling_restart_mode: "{{ openshift_rolling_restart_mode | default('services') }}" - - role: master - local_facts: - cluster_method: "{{ openshift_master_cluster_method | default(None) }}" # Creating a temp file on localhost, we then check each system that will # be rebooted to see if that file exists, if so we know we're running |