ceph-validate : Added functions to accept true and flase

ceph-validate used to throw error for setting flags as 'true' or 'false' for True and False
Now user can set the flags 'dmcrypt' and 'osd_auto_discovery' as 'true' or 'false'

Will fix - Bug 1638325

Signed-off-by: VasishtaShastry <vipin.indiasmg@gmail.com>
(cherry picked from commit 098f42f2334c442bf418f09d3f4b3b99750c7ba0)

diff --git a/plugins/actions/validate.py b/plugins/actions/validate.py
index 552c55b1c6fa7d9d57bae275141357dbd41ba19a..620358eae9e5720b6ac99a0a2f5da52f865c4735 100644 (file)
--- a/plugins/actions/validate.py
+++ b/plugins/actions/validate.py
@@ -155,6 +155,14 @@ def validate_monitor_options(value):
     assert any([monitor_address_given, monitor_address_block_given, monitor_interface_given]), msg
 
 
+def validate_dmcrypt_bool_value(value):
+    assert value in ["true", True, "false", False], "dmcrypt can be set to true/True or false/False (default)"
+
+
+def validate_osd_auto_discovery_bool_value(value):
+    assert value in ["true", True, "false", False], "osd_auto_discovery can be set to true/True or false/False (default)"
+
+
 def validate_osd_scenarios(value):
     assert value in ["collocated", "non-collocated", "lvm"], "osd_scenario must be set to 'collocated', 'non-collocated' or 'lvm'"
 
@@ -222,8 +230,8 @@ rados_options = (
 )
 
 osd_options = (
-    (optional("dmcrypt"), types.boolean),
-    (optional("osd_auto_discovery"), types.boolean),
+    (optional("dmcrypt"), validate_dmcrypt_bool_value),
+    (optional("osd_auto_discovery"), validate_osd_auto_discovery_bool_value),
     ("osd_scenario", validate_osd_scenarios),
 )