From 857c68087d65b65f4986a9c1661efa9b8eba16c3 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 4 Oct 2019 16:03:27 +0200 Subject: [PATCH] handler: followup on #4519 This commit adds some missing `| bool` filters. Signed-off-by: Guillaume Abrioux (cherry picked from commit ccc11cfc933f88cec22ffca477cf8431fe024e09) --- roles/ceph-handler/tasks/main.yml | 38 ++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/roles/ceph-handler/tasks/main.yml b/roles/ceph-handler/tasks/main.yml index 09280cdee..270fb00d7 100644 --- a/roles/ceph-handler/tasks/main.yml +++ b/roles/ceph-handler/tasks/main.yml @@ -1,3 +1,39 @@ --- - name: include check_running_cluster.yml - include: check_running_cluster.yml \ No newline at end of file + include: check_running_cluster.yml + +# We do not want to run these checks on initial deployment (`socket.rc == 0`) +- name: set_fact handler_mon_status + set_fact: + handler_mon_status: "{{ (mon_socket_stat.get('rc') == 0) if not containerized_deployment | bool else (ceph_mon_container_stat.get('rc') == 0 and ceph_mon_container_stat.get('stdout_lines', []) | length != 0) }}" + when: inventory_hostname in groups.get(mon_group_name, []) + +- name: set_fact handler_osd_status + set_fact: + handler_osd_status: "{{ (osd_socket_stat.get('rc') == 0 and ceph_current_status.fsid is defined) if not containerized_deployment | bool else (ceph_osd_container_stat.get('rc') == 0 and ceph_osd_container_stat.get('stdout_lines', []) | length != 0) }}" + when: inventory_hostname in groups.get(osd_group_name, []) + +- name: set_fact handler_mds_status + set_fact: + handler_mds_status: "{{ (mds_socket_stat.get('rc') == 0) if not containerized_deployment | bool else (ceph_mds_container_stat.get('rc') == 0 and ceph_mds_container_stat.get('stdout_lines', []) | length != 0) }}" + when: inventory_hostname in groups.get(mds_group_name, []) + +- name: set_fact handler_rgw_status + set_fact: + handler_rgw_status: "{{ (rgw_socket_stat.get('rc') == 0) if not containerized_deployment | bool else (ceph_rgw_container_stat.get('rc') == 0 and ceph_rgw_container_stat.get('stdout_lines', []) | length != 0) }}" + when: inventory_hostname in groups.get(rgw_group_name, []) + +- name: set_fact handler_nfs_status + set_fact: + handler_nfs_status: "{{ (nfs_socket_stat.get('rc') == 0) if not containerized_deployment | bool else (ceph_nfs_container_stat.get('rc') == 0 and ceph_nfs_container_stat.get('stdout_lines', []) | length != 0) }}" + when: inventory_hostname in groups.get(nfs_group_name, []) + +- name: set_fact handler_rbd_status + set_fact: + handler_rbd_mirror_status: "{{ (rbd_mirror_socket_stat.get('rc') == 0) if not containerized_deployment | bool else (ceph_rbd_mirror_container_stat.get('rc') == 0 and ceph_rbd_mirror_container_stat.get('stdout_lines', []) | length != 0) }}" + when: inventory_hostname in groups.get(rbdmirror_group_name, []) + +- name: set_fact handler_mgr_status + set_fact: + handler_mgr_status: "{{ (mgr_socket_stat.get('rc') == 0) 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, [])