ceph-crash: move handler in the dedicated role

Move the ceph crash handler into its own role. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1956441 Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
ceph · Jul 5, 2021 · 1a9e667 · 1a9e667
1 parent 993d06c
commit 1a9e667
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 64 deletions.
diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
@@ -912,8 +912,6 @@
     - import_role:
         name: ceph-facts
         tasks_from: container_binary.yml
-    - import_role:
-        name: ceph-handler
     - import_role:
         name: ceph-crash
 

diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
@@ -673,9 +673,6 @@
         name: ceph-facts
         tasks_from: container_binary.yml
 
-    - import_role:
-        name: ceph-handler
-
     - import_role:
         name: ceph-crash
 

diff --git a/roles/ceph-container-common/handlers/main.yml b/roles/ceph-container-common/handlers/main.yml
@@ -0,0 +1,9 @@
+---
+- name: restart ceph crash
+  systemd:
+    name: ceph-crash@{{ ansible_facts['hostname'] }}
+    state: restarted
+    enabled: yes
+    masked: no
+    daemon_reload: yes
+  ignore_errors: true
diff --git a/roles/ceph-crash/handlers/main.yml b/roles/ceph-crash/handlers/main.yml
@@ -0,0 +1,9 @@
+---
+- name: restart ceph crash
+  systemd:
+    name: ceph-crash@{{ ansible_facts['hostname'] }}
+    state: restarted
+    enabled: yes
+    masked: no
+    daemon_reload: yes
+  ignore_errors: true
diff --git a/roles/ceph-handler/handlers/main.yml b/roles/ceph-handler/handlers/main.yml
@@ -64,17 +64,6 @@
       when: iscsi_gw_group_name in group_names
       listen: "restart ceph rbd-target-api-gw"
 
-    - name: ceph crash handler
-      include_tasks: handler_crash.yml
-      listen: "restart ceph crash"
-      when:
-        - inventory_hostname in groups.get(mon_group_name, [])
-          or inventory_hostname in groups.get(mgr_group_name, [])
-          or inventory_hostname in groups.get(osd_group_name, [])
-          or inventory_hostname in groups.get(mds_group_name, [])
-          or inventory_hostname in groups.get(rgw_group_name, [])
-          or inventory_hostname in groups.get(rbdmirror_group_name, [])
-
     - name: remove tempdir for scripts
       file:
         path: "{{ tmpdirpath.path }}"

diff --git a/roles/ceph-handler/tasks/check_socket_non_container.yml b/roles/ceph-handler/tasks/check_socket_non_container.yml
@@ -227,18 +227,4 @@
   changed_when: false
   failed_when: false
   check_mode: no
-  when: inventory_hostname in groups.get(iscsi_gw_group_name, [])
-
-- name: check for a ceph-crash process
-  command: pgrep ceph-crash
-  changed_when: false
-  failed_when: false
-  check_mode: no
-  register: crash_process
-  when:
-    - inventory_hostname in groups.get(mon_group_name, [])
-      or inventory_hostname in groups.get(mgr_group_name, [])
-      or inventory_hostname in groups.get(osd_group_name, [])
-      or inventory_hostname in groups.get(mds_group_name, [])
-      or inventory_hostname in groups.get(rgw_group_name, [])
-      or inventory_hostname in groups.get(rbdmirror_group_name, [])
+  when: inventory_hostname in groups.get(iscsi_gw_group_name, [])
diff --git a/roles/ceph-handler/tasks/handler_crash.yml b/roles/ceph-handler/tasks/handler_crash.yml
diff --git a/roles/ceph-handler/tasks/main.yml b/roles/ceph-handler/tasks/main.yml
@@ -38,17 +38,6 @@
     handler_mgr_status: "{{ 0 in (mgr_socket.results | map(attribute='rc') | list) if not containerized_deployment | bool else (ceph_mgr_container_stat.get('rc') == 0 and ceph_mgr_container_stat.get('stdout_lines', []) | length != 0) }}"
   when: inventory_hostname in groups.get(mgr_group_name, [])
 
-- name: set_fact handler_crash_status
-  set_fact:
-    handler_crash_status: "{{ crash_process.get('rc') == 0 if not containerized_deployment | bool else (ceph_crash_container_stat.get('rc') == 0 and ceph_crash_container_stat.get('stdout_lines', []) | length != 0) }}"
-  when:
-    - inventory_hostname in groups.get(mon_group_name, [])
-      or inventory_hostname in groups.get(mgr_group_name, [])
-      or inventory_hostname in groups.get(osd_group_name, [])
-      or inventory_hostname in groups.get(mds_group_name, [])
-      or inventory_hostname in groups.get(rgw_group_name, [])
-      or inventory_hostname in groups.get(rbdmirror_group_name, [])
-
 - name: rgw multi-instances related tasks
   when:
     - not docker2podman | default(false) | bool

diff --git a/site-container.yml.sample b/site-container.yml.sample
@@ -465,8 +465,6 @@
     - import_role:
         name: ceph-facts
         tasks_from: container_binary.yml
-    - import_role:
-        name: ceph-handler
     - import_role:
         name: ceph-crash
 

diff --git a/site.yml.sample b/site.yml.sample
@@ -488,8 +488,6 @@
     - import_role:
         name: ceph-facts
         tasks_from: container_binary.yml
-    - import_role:
-        name: ceph-handler
     - import_role:
         name: ceph-crash