validate: do not validate devices or lvm_volumes in osd_auto_discovery case

we shouldn't validate these two variables when `osd_auto_discovery` is
set.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1644623
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 243edfbc963baa68af0e0acf8489c4b920f57c1a)

diff --git a/plugins/actions/validate.py b/plugins/actions/validate.py
index f990d8340742189cf070a4d621dca0b312a29f87..8ca428cc5134a48debfc6f2573a860e14a12686c 100644 (file)
--- a/plugins/actions/validate.py
+++ b/plugins/actions/validate.py
@@ -91,12 +91,13 @@ class ActionModule(ActionBase):
                     notario.validate(host_vars, non_collocated_osd_scenario, defined_keys=True)
 
                 if host_vars["osd_scenario"] == "lvm":
-                    if host_vars.get("devices"):
-                        notario.validate(host_vars, lvm_batch_scenario, defined_keys=True)
-                    elif notario_store['osd_objectstore'] == 'filestore':
-                        notario.validate(host_vars, lvm_filestore_scenario, defined_keys=True)
-                    elif notario_store['osd_objectstore'] == 'bluestore':
-                        notario.validate(host_vars, lvm_bluestore_scenario, defined_keys=True)
+                    if not host_vars.get("osd_auto_discovery", False):
+                        if host_vars.get("devices"):
+                            notario.validate(host_vars, lvm_batch_scenario, defined_keys=True)
+                        elif notario_store['osd_objectstore'] == 'filestore':
+                            notario.validate(host_vars, lvm_filestore_scenario, defined_keys=True)
+                        elif notario_store['osd_objectstore'] == 'bluestore':
+                            notario.validate(host_vars, lvm_bluestore_scenario, defined_keys=True)
 
         except Invalid as error:
             display.vvvv("Notario Failure: %s" % str(error))