Merge pull request #2627 from dgoodwin/remove-pacemaker-restarts

Drop pacemaker restart logic.

playbooks/common/openshift-master/restart.yml

@@ -66,63 +66,8 @@
       current_host: "{{ exists.stat.exists }}"
     when: openshift.common.rolling_restart_mode == 'system'
 
-- name: Determine which masters are currently active
-  hosts: oo_masters_to_config
-  any_errors_fatal: true
-  tasks:
-  - name: Check master service status
-    command: >
-      systemctl is-active {{ openshift.common.service_type }}-master
-    register: active_check_output
-    when: openshift.master.cluster_method | default(None) == 'pacemaker'
-    failed_when: false
-    changed_when: false
-  - set_fact:
-      is_active: "{{ active_check_output.stdout == 'active' }}"
-    when: openshift.master.cluster_method | default(None) == 'pacemaker'
-
-- name: Evaluate master groups
-  hosts: localhost
-  become: no
-  tasks:
-  - fail:
-      msg: >
-        Did not receive active status from any masters. Please verify pacemaker cluster.
-    when: "{{ hostvars[groups.oo_first_master.0].openshift.master.cluster_method | default(None) == 'pacemaker' and 'True' not in (hostvars
-              | oo_select_keys(groups['oo_masters_to_config'])
-              | oo_collect('is_active')
-              | list) }}"
-  - name: Evaluate oo_active_masters
-    add_host:
-      name: "{{ item }}"
-      groups: oo_active_masters
-      ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
-      ansible_become: "{{ g_sudo | default(omit) }}"
-    with_items: "{{ groups.oo_masters_to_config | default([]) }}"
-    when: (hostvars[item]['is_active'] | default(false)) | bool
-  - name: Evaluate oo_current_masters
-    add_host:
-      name: "{{ item }}"
-      groups: oo_current_masters
-      ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
-      ansible_become: "{{ g_sudo | default(omit) }}"
-    with_items: "{{ groups.oo_masters_to_config | default([]) }}"
-    when: (hostvars[item]['current_host'] | default(false)) | bool
-
-- name: Validate pacemaker cluster
-  hosts: oo_active_masters
-  tasks:
-  - name: Retrieve pcs status
-    command: pcs status
-    register: pcs_status_output
-    changed_when: false
-  - fail:
-      msg: >
-        Pacemaker cluster validation failed. One or more nodes are not online.
-    when: not (pcs_status_output.stdout | validate_pcs_cluster(groups.oo_masters_to_config)) | bool
-
 - name: Restart masters
-  hosts: oo_masters_to_config:!oo_active_masters:!oo_current_masters
+  hosts: oo_masters_to_config
   vars:
     openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}"
   serial: 1
@@ -132,20 +77,3 @@
   - include: restart_services.yml
     when: openshift.common.rolling_restart_mode == 'services'
 
-- name: Restart active masters
-  hosts: oo_active_masters
-  serial: 1
-  tasks:
-  - include: restart_hosts_pacemaker.yml
-    when: openshift.common.rolling_restart_mode == 'system'
-  - include: restart_services_pacemaker.yml
-    when: openshift.common.rolling_restart_mode == 'services'
-
-- name: Restart current masters
-  hosts: oo_current_masters
-  serial: 1
-  tasks:
-  - include: restart_hosts.yml
-    when: openshift.common.rolling_restart_mode == 'system'
-  - include: restart_services.yml
-    when: openshift.common.rolling_restart_mode == 'services'

playbooks/common/openshift-master/restart_hosts.yml

@@ -5,8 +5,8 @@
   poll: 0
   ignore_errors: true
   become: yes
-# When cluster_method != pacemaker we can ensure the api_port is
-# available.
+
+# Ensure the api_port is available.
 - name: Wait for master API to come back online
   become: no
   local_action:
@@ -15,25 +15,3 @@
       state=started
       delay=10
       port="{{ openshift.master.api_port }}"
-  when: openshift.master.cluster_method != 'pacemaker'
-- name: Wait for master to start
-  become: no
-  local_action:
-    module: wait_for
-      host="{{ inventory_hostname }}"
-      state=started
-      delay=10
-      port=22
-  when: openshift.master.cluster_method == 'pacemaker'
-- name: Wait for master to become available
-  command: pcs status
-  register: pcs_status_output
-  until: pcs_status_output.stdout | validate_pcs_cluster([inventory_hostname]) | bool
-  retries: 15
-  delay: 2
-  changed_when: false
-  when: openshift.master.cluster_method == 'pacemaker'
-- fail:
-    msg: >
-      Pacemaker cluster validation failed {{ inventory hostname }} is not online.
-  when: openshift.master.cluster_method == 'pacemaker' and not (pcs_status_output.stdout | validate_pcs_cluster([inventory_hostname])) | bool

playbooks/common/openshift-master/restart_hosts_pacemaker.yml

@@ -1,25 +0,0 @@
-- name: Fail over master resource
-  command: >
-    pcs resource move master {{ hostvars | oo_select_keys(groups['oo_masters_to_config']) | oo_collect('openshift.common.hostname', {'is_active': 'False'}) | list | first }}
-- name: Wait for master API to come back online
-  become: no
-  local_action:
-    module: wait_for
-      host="{{ openshift.master.cluster_hostname }}"
-      state=started
-      delay=10
-      port="{{ openshift.master.api_port }}"
-- name: Restart master system
-  # https://github.com/ansible/ansible/issues/10616
-  shell: sleep 2 && shutdown -r now "OpenShift Ansible master rolling restart"
-  async: 1
-  poll: 0
-  ignore_errors: true
-  become: yes
-- name: Wait for master to start
-  become: no
-  local_action:
-   module: wait_for
-      host="{{ inventory_hostname }}"
-      state=started
-      delay=10

playbooks/common/openshift-master/restart_services_pacemaker.yml

@@ -1,10 +0,0 @@
-- name: Restart master services
-  command: pcs resource restart master
-- name: Wait for master API to come back online
-  become: no
-  local_action:
-    module: wait_for
-      host="{{ openshift.master.cluster_hostname }}"
-      state=started
-      delay=10
-      port="{{ openshift.master.api_port }}"