From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 7 Nov 2017 14:30:08 +0000 (+0100)
Subject: osd: skip some set_fact when osd_scenario=lvm
X-Git-Tag: v3.0.11~1^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2168%2Fhead;p=ceph-ansible.git

osd: skip some set_fact when osd_scenario=lvm

these tasks are not needed when using `osd_scenario: lvm`

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509230

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 238754a8446f5ae3d2eefea9420e6d61f4426481)
---

diff --git a/roles/ceph-defaults/tasks/facts.yml b/roles/ceph-defaults/tasks/facts.yml
index 8d2e5c606..77cb72846 100644
--- a/roles/ceph-defaults/tasks/facts.yml
+++ b/roles/ceph-defaults/tasks/facts.yml
@@ -133,6 +133,7 @@
   when:
     - inventory_hostname in groups.get(osd_group_name, [])
     - not osd_auto_discovery|default(False)
+    - osd_scenario != 'lvm'
 
 - name: set_fact build devices from resolved symlinks
   set_fact:
@@ -141,6 +142,7 @@
   when:
     - inventory_hostname in groups.get(osd_group_name, [])
     - not osd_auto_discovery|default(False)
+    - osd_scenario != 'lvm'
 
 - name: set_fact build final devices list
   set_fact:
@@ -148,3 +150,4 @@
   when:
     - inventory_hostname in groups.get(osd_group_name, [])
     - not osd_auto_discovery|default(False)
+    - osd_scenario != 'lvm'