osd: refact include of `activate_osds.yml`

remove duplicate code.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index c74487dd2ed2da2ead8228edab219fe83d2c3e2a..5860723b4b4f0c7353d79818eafc3e7983ab2d24 100644 (file)
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -41,6 +41,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:

diff --git a/roles/ceph-osd/tasks/scenarios/collocated.yml b/roles/ceph-osd/tasks/scenarios/collocated.yml
index f62f83ac8d56c59acf6a41a39394f46ec069fa21..fba11a3f2152a958cf2a815b9d7a709e5fc84957 100644 (file)
--- a/roles/ceph-osd/tasks/scenarios/collocated.yml
+++ b/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

diff --git a/roles/ceph-osd/tasks/scenarios/non-collocated.yml b/roles/ceph-osd/tasks/scenarios/non-collocated.yml
index 9a744300c357a41cc781f83ed7f430ec5c910b50..1e74c6e996ad49eb1913b300074ea2519155774f 100644 (file)
--- a/roles/ceph-osd/tasks/scenarios/non-collocated.yml
+++ b/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