From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 12 Sep 2017 21:49:11 +0000 (+0200)
Subject: osd: refact include of `activate_osds.yml`
X-Git-Tag: v3.0.0rc8~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1883%2Fhead;p=ceph-ansible.git

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 c74487dd2..5860723b4 100644
--- 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 f62f83ac8..fba11a3f2 100644
--- 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 9a744300c..1e74c6e99 100644
--- 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