From 5ce530c909a86540807bc294ef832135d92d5e87 Mon Sep 17 00:00:00 2001
From: hayden <sktpghks138@gmail.com>
Date: Fri, 3 May 2024 18:34:06 +0900
Subject: [PATCH] Merge stops and removes systemd services tasks in reset
 playbook (#10902)

---
 roles/reset/tasks/main.yml | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
index 98950966d..0f13f686b 100644
--- a/roles/reset/tasks/main.yml
+++ b/roles/reset/tasks/main.yml
@@ -7,6 +7,8 @@
     - kubelet.service
     - cri-dockerd.service
     - cri-dockerd.socket
+    - etcd.service
+    - etcd-events.service
   failed_when: false
   tags:
     - services
@@ -24,6 +26,8 @@
     - crio.service.d/http-proxy.conf
     - k8s-certs-renew.service
     - k8s-certs-renew.timer
+    - etcd.service
+    - etcd-events.service
   register: services_removed
   tags:
     - services
@@ -134,28 +138,6 @@
       ignore_errors: true  # noqa ignore-errors
       changed_when: true
 
-- name: Reset | stop etcd services
-  service:
-    name: "{{ item }}"
-    state: stopped
-  with_items:
-    - etcd
-    - etcd-events
-  failed_when: false
-  tags:
-    - services
-
-- name: Reset | remove etcd services
-  file:
-    path: "/etc/systemd/system/{{ item }}.service"
-    state: absent
-  with_items:
-    - etcd
-    - etcd-events
-  register: services_removed
-  tags:
-    - services
-
 - name: Reset | remove containerd
   when: container_manager == 'containerd'
   block: