actualized for kubespray version 2.28.0

kubespray/project/roles/etcd/handlers/main.yml

@@ -2,30 +2,29 @@
 - name: Backup etcd
   import_tasks: backup.yml
 
-- name: Etcd | reload systemd
+- name: Restart etcd
   systemd_service:
-    daemon_reload: true
-  listen:
-    - Restart etcd
-    - Restart etcd-events
-
-- name: Reload etcd
-  service:
     name: etcd
     state: restarted
-  when: is_etcd_master
-  listen: Restart etcd
+    daemon_reload: true
+  when: ('etcd' in group_names)
+  throttle: "{{ groups['etcd'] | length // 2 }}"
+  # Etcd cluster MUST have an odd number of members
+  # Truncated integer division by 2 will always return (majority - 1) which
+  # means the cluster will keep quorum and stay available
 
-- name: Reload etcd-events
-  service:
+- name: Restart etcd-events
+  systemd_service:
     name: etcd-events
     state: restarted
-  when: is_etcd_master
-  listen: Restart etcd-events
+    daemon_reload: true
+  # TODO: this seems odd. etcd-events should be a different group possibly ?
+  when: ('etcd' in group_names)
+  throttle: "{{ groups['etcd'] | length // 2 }}"
 
 - name: Wait for etcd up
   uri:
-    url: "https://{% if is_etcd_master %}{{ etcd_address }}{% else %}127.0.0.1{% endif %}:2379/health"
+    url: "https://{% if 'etcd' in group_names %}{{ etcd_address | ansible.utils.ipwrap }}{% else %}127.0.0.1{% endif %}:2379/health"
     validate_certs: false
     client_cert: "{{ etcd_cert_dir }}/member-{{ inventory_hostname }}.pem"
     client_key: "{{ etcd_cert_dir }}/member-{{ inventory_hostname }}-key.pem"
@@ -40,7 +39,7 @@
 
 - name: Wait for etcd-events up
   uri:
-    url: "https://{% if is_etcd_master %}{{ etcd_address }}{% else %}127.0.0.1{% endif %}:2383/health"
+    url: "https://{% if 'etcd' in group_names %}{{ etcd_address | ansible.utils.ipwrap }}{% else %}127.0.0.1{% endif %}:2383/health"
     validate_certs: false
     client_cert: "{{ etcd_cert_dir }}/member-{{ inventory_hostname }}.pem"
     client_key: "{{ etcd_cert_dir }}/member-{{ inventory_hostname }}-key.pem"