Fix 'raw_journal_devices' to be initialized as a list in ceph-common defaults. Add...

This is done for preventing of their use-before-definition for osd scenarios checks (should be removed after a refactor has properly seperated all the checks into appropriate roles).

Signed-off-by: Eduard Egorov <eduard.egorov@icl-services.com>

diff --git a/group_vars/all.sample b/group_vars/all.sample
index 0f68fa5dc6d79dff791845f60e9508b300ab5eeb..f84749c6350ba8b7edfbd8931464a4b0c843ea59 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -368,7 +368,8 @@ dummy:
 #bluestore: False
 #dmcrypt_journal_collocation: False
 #dmcrypt_dedicated_journal: False
-#raw_journal_devices: {}
+#raw_journal_devices: []
+#devices: []
 
 #osd_auto_discovery: False
 

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 31de9cd700258facf86f042c5d20cdf54b04fe0c..92b7c99eaf44012686a83bbf5e2657a1b6865733 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -360,7 +360,8 @@ osd_directory: False
 bluestore: False
 dmcrypt_journal_collocation: False
 dmcrypt_dedicated_journal: False
-raw_journal_devices: {}
+raw_journal_devices: []
+devices: []
 
 osd_auto_discovery: False
 

diff --git a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
index 9750495110257ac3cad69fdd205c19cc5ed43002..f8858b0cc86bcbc4049b9b1e3d7635e6a754b21a 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
+++ b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
@@ -106,17 +106,17 @@
     - osd_group_name in group_names
     - journal_collocation
     - not osd_auto_discovery
-    - devices is not defined
+    - devices|length == 0
 
 - name: verify journal devices have been provided
   fail:
-    msg: "please provide devices to your osd scenario"
+    msg: "please provide devices and raw journal devices to your osd scenario"
   when:
     - osd_group_name is defined
     - osd_group_name in group_names
     - raw_multi_journal
-    - raw_journal_devices is not defined
-      or devices is not defined
+    - raw_journal_devices|length == 0
+      or devices|length == 0
 
 - name: verify directories have been provided
   fail: