diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index fc6d6a2d4..9e683bc3f 100644
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -88,10 +88,12 @@
   when:
     - not ansible_check_mode
     - inventory_hostname == ansible_play_hosts_all | last
+  tags: wait_all_osds_up
 
 - name: include crush_rules.yml
   include_tasks: crush_rules.yml
   when: hostvars[groups[mon_group_name][0]]['crush_rule_config'] | default(crush_rule_config) | bool
+  tags: wait_all_osds_up
 
 # Create the pools listed in openstack_pools
 - name: include openstack_config.yml
@@ -101,3 +103,4 @@
     - not rolling_update | default(False) | bool
     - openstack_config | bool
     - inventory_hostname == groups[osd_group_name] | last
+  tags: wait_all_osds_up
\ No newline at end of file