diff --git a/deployment/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml
index be60dbb5a8..93054fcf15 100644
--- a/deployment/ceph-ansible/ceph-base.yaml
+++ b/deployment/ceph-ansible/ceph-base.yaml
@@ -779,6 +779,17 @@ outputs:
               fail:
                 msg: The ceph-ansible filestore to bluestore playbook limit is not set; please use -e ceph_ansible_limit=##nodename##
               when: (ceph_ansible_limit is not defined) or (ceph_ansible_limit|length == 0)
+            - name: ensure ceph health is OK before proceeding
+              import_role:
+                role: ceph
+                tasks_from: ceph-health
+              vars:
+                fail_on_ceph_health_err: true
+                fail_on_ceph_health_warn: true
+                osd_percentage_min: 0
+                tripleo_delegate_to: "{{ groups['ceph_mon'] | default([]) }}"
+              tags:
+                - ceph_health
             - name: set ceph_ansible_playbooks_default
               set_fact:
                 ceph_ansible_playbooks_default: ["/usr/share/ceph-ansible/infrastructure-playbooks/filestore-to-bluestore.yml"]