From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Mon, 27 Nov 2017 13:59:30 +0000 (+0100)
Subject: handlers: restart daemons only if docker is running
X-Git-Tag: v3.0.16~24^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2217%2Fhead;p=ceph-ansible.git

handlers: restart daemons only if docker is running

In case where docker CLI is available but docker is not running, we
don't want to trigger the restart of the daemons.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1510555

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit b26a840002c548dcbddf71a04229c16cff3699c6)
Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/roles/ceph-defaults/handlers/main.yml b/roles/ceph-defaults/handlers/main.yml
index 7a10889df..6e1953193 100644
--- a/roles/ceph-defaults/handlers/main.yml
+++ b/roles/ceph-defaults/handlers/main.yml
@@ -38,6 +38,7 @@
     # We do not want to run these checks on initial deployment (`socket.rc == 0`)
     - mon_group_name in group_names
     - containerized_deployment
+    - ceph_mon_container_stat.get('rc') == 0
     - inventory_hostname == groups.get(mon_group_name) | last
     - inventory_hostname in play_hosts
     - ceph_mon_container_stat.get('stdout_lines', [])|length != 0
@@ -86,6 +87,7 @@
     # except when a crush location is specified. ceph-disk will start the osds before the osd crush location is specified
     - osd_group_name in group_names
     - containerized_deployment
+    - ceph_osd_container_stat.get('rc') == 0
     - inventory_hostname == groups.get(osd_group_name) | last
     - ((crush_location is defined and crush_location) or ceph_osd_container_stat.get('stdout_lines', [])|length != 0)
     - handler_health_osd_check
@@ -128,6 +130,7 @@
     # We do not want to run these checks on initial deployment (`socket.rc == 0`)
     - mds_group_name in group_names
     - containerized_deployment
+    - ceph_mds_container_stat.get('rc') == 0
     - inventory_hostname == groups.get(mds_group_name) | last
     - inventory_hostname in play_hosts
     - ceph_mds_container_stat.get('stdout_lines', [])|length != 0
@@ -168,6 +171,7 @@
     # We do not want to run these checks on initial deployment (`socket.rc == 0`)
     - rgw_group_name in group_names
     - containerized_deployment
+    - ceph_rgw_container_stat.get('rc') == 0
     - inventory_hostname == groups.get(rgw_group_name) | last
     - inventory_hostname in play_hosts
     - ceph_rgw_container_stat.get('stdout_lines', [])|length != 0
@@ -208,6 +212,7 @@
     # We do not want to run these checks on initial deployment (`socket.rc == 0`)
     - nfs_group_name in group_names
     - containerized_deployment
+    - ceph_nfs_container_stat.get('rc') == 0
     - inventory_hostname == groups.get(nfs_group_name) | last
     - inventory_hostname in play_hosts
     - ceph_nfs_container_stat.get('stdout_lines', [])|length != 0
@@ -248,6 +253,7 @@
     # We do not want to run these checks on initial deployment (`socket.rc == 0`)
     - rbdmirror_group_name in group_names
     - containerized_deployment
+    - ceph_rbd_mirror_container_stat.get('rc') == 0
     - inventory_hostname == groups.get(rbdmirror_group_name) | last
     - inventory_hostname in play_hosts
     - ceph_rbd_mirror_container_stat.get('stdout_lines', [])|length != 0
@@ -288,6 +294,7 @@
     # We do not want to run these checks on initial deployment (`socket.rc == 0`)
     - mgr_group_name in group_names
     - containerized_deployment
+    - ceph_mgr_container_stat.get('rc') == 0
     - inventory_hostname == groups.get(mgr_group_name) | last
     - inventory_hostname in play_hosts
     - ceph_mgr_container_stat.get('stdout_lines', [])|length != 0