From: Andrew Schoen Date: Thu, 3 Aug 2017 16:49:18 +0000 (-0500) Subject: ceph-defaults: fix containerized osd restarts X-Git-Tag: v3.0.0rc1~3^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=be78bc1a9069e1be98edaf536eaa483720b8a552;p=ceph-ansible.git ceph-defaults: fix containerized osd restarts This needs to check `containerized_deployment` because socket_osd_container is undefined otherwise. Signed-off-by: Andrew Schoen --- diff --git a/roles/ceph-defaults/handlers/main.yml b/roles/ceph-defaults/handlers/main.yml index e8659f904..f661e3b1c 100644 --- a/roles/ceph-defaults/handlers/main.yml +++ b/roles/ceph-defaults/handlers/main.yml @@ -44,6 +44,7 @@ when: # We do not want to run these checks on initial deployment (`socket_osd_container.results[n].rc == 0`) # except when a crush location is specified. ceph-disk will start the osds before the osd crush location is specified + - containerized_deployment - ((crush_location is defined and crush_location) or item.get('rc') == 0) - handler_health_osd_check # See https://github.com/ceph/ceph-ansible/issues/1457 for the condition below