Merge pull request #8140 from mtnbikenc/fix-etcd-restart

Update etcd restart command

roles/etcd/handlers/main.yml

@@ -1,5 +1,3 @@
 ---
-
 - name: restart etcd
-  systemd: name={{ etcd_service }} state=restarted
-  when: not (etcd_service_status_changed | default(false) | bool)
+  command: /usr/local/bin/master-restart etcd

roles/etcd/tasks/restart.yml

@@ -1,21 +1,3 @@
 ---
-
 - name: restart etcd
-  service:
-    name: "{{ etcd_service }}"
-    state: restarted
-  when:
-    - not g_etcd_certificates_expired | default(false) | bool
-
-- name: stop etcd
-  service:
-    name: "{{ etcd_service }}"
-    state: stopped
-  when:
-    - g_etcd_certificates_expired | default(false) | bool
-- name: start etcd
-  service:
-    name: "{{ etcd_service }}"
-    state: started
-  when:
-    - g_etcd_certificates_expired | default(false) | bool
+  command: /usr/local/bin/master-restart etcd

roles/etcd/tasks/upgrade/upgrade_image.yml

@@ -22,11 +22,8 @@
 
 - import_tasks: validate_etcd_conf.yml
 
-- name: Restart etcd_container
-  systemd:
-    name: "{{ etcd_service }}"
-    daemon_reload: yes
-    state: restarted
+- name: restart etcd
+  command: /usr/local/bin/master-restart etcd
 
 ## TODO: probably should just move this into the backup playbooks, also this
 ## will fail on atomic host. We need to revisit how to do etcd backups there as

roles/etcd/tasks/upgrade/upgrade_rpm.yml

@@ -23,10 +23,8 @@
 
 - import_tasks: validate_etcd_conf.yml
 
-- name: Restart etcd
-  service:
-    name: "{{ etcd_service }}"
-    state: restarted
+- name: restart etcd
+  command: /usr/local/bin/master-restart etcd
 
 - name: Verify cluster is healthy
   command: "{{ etcdctlv2 }} cluster-health"