From 49ad8528e5a13c0e154c25f9e60811d232d750f4 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 12 Sep 2017 23:49:11 +0200 Subject: [PATCH] osd: refact include of `activate_osds.yml` remove duplicate code. Signed-off-by: Guillaume Abrioux --- roles/ceph-osd/tasks/main.yml | 6 ++++++ roles/ceph-osd/tasks/scenarios/collocated.yml | 2 -- roles/ceph-osd/tasks/scenarios/non-collocated.yml | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) 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 -- 2.39.5