Merge pull request #1883 from ceph/quick_refact

osd: refact include of `activate_osds.yml`

roles/ceph-osd/tasks/main.yml

@@ -46,6 +46,12 @@
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
+- include: ./activate_osds.yml
+  when:
+    - not containerized_deployment
+  # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
+  static: False
+
 - name: ensure osd daemons are started
   include: start_osds.yml
   when:

roles/ceph-osd/tasks/scenarios/collocated.yml

@@ -67,5 +67,3 @@
     - item.0.get("rc", 0) != 0
     - item.1.get("rc", 0) != 0
     - not containerized_deployment
-
-- include: ../activate_osds.yml

roles/ceph-osd/tasks/scenarios/non-collocated.yml

@@ -85,5 +85,3 @@
     - item.0.get("rc", 0) != 0
     - osd_objectstore == 'bluestore'
     - not containerized_deployment
-
-- include: ../activate_osds.yml