From: Andy McCrae <andy.mccrae@gmail.com>
Date: Mon, 17 Aug 2015 10:20:46 +0000 (+0100)
Subject: Check to ensure device checks only happen on osds
X-Git-Tag: v1.0.0~129^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F379%2Fhead;p=ceph-ansible.git

Check to ensure device checks only happen on osds

Add bool for osd_group_name in group_names for osd checks.
---

diff --git a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
index 905d6c387..e05593318 100644
--- a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
+++ b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
@@ -34,6 +34,7 @@
   fail: msg="please choose an osd scenario"
   when:
     osd_group_name is defined and
+    osd_group_name in group_names and
     not journal_collocation and
     not raw_multi_journal and
     not osd_directory
@@ -42,6 +43,7 @@
   fail: msg="please select only one osd scenario"
   when:
     osd_group_name is defined and
+    osd_group_name in group_names and
     ((journal_collocation and raw_multi_journal) or
     (journal_collocation and osd_directory) or
     (raw_multi_journal and osd_directory))
@@ -50,6 +52,7 @@
   fail: msg="please provide devices to your osd scenario"
   when:
     osd_group_name is defined and
+    osd_group_name in group_names and
     journal_collocation and
     devices is not defined
 
@@ -57,6 +60,7 @@
   fail: msg="please provide devices to your osd scenario"
   when:
     osd_group_name is defined and
+    osd_group_name in group_names and
     raw_multi_journal and
     (raw_journal_devices is not defined or
     devices is not defined)