From: Andy McCrae <andy.mccrae@gmail.com>
Date: Fri, 14 Aug 2015 14:18:18 +0000 (+0100)
Subject: Fix devices check for raw_multi_journal
X-Git-Tag: v1.0.0~131^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=25a45332f3cf28777532199db06b8a62e4597d4c;p=ceph-ansible.git

Fix devices check for raw_multi_journal

Fix the logic for the mandatory devices check so that it applies to
raw_multi_journal and journal_collocation scenarios separately.

This fails otherwise because whichever var is "first" in the or is most
likely undefined.
---

diff --git a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
index 2130cb3f1..905d6c387 100644
--- a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
+++ b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
@@ -50,7 +50,7 @@
   fail: msg="please provide devices to your osd scenario"
   when:
     osd_group_name is defined and
-    (journal_collocation or raw_multi_journal) and
+    journal_collocation and
     devices is not defined
 
 - name: verify journal devices have been provided
@@ -58,7 +58,8 @@
   when:
     osd_group_name is defined and
     raw_multi_journal and
-    raw_journal_devices is not defined
+    (raw_journal_devices is not defined or
+    devices is not defined)
 
 - name: verify directories have been provided
   fail: msg="please provide directories to your osd scenario"