From: Guillaume Abrioux Date: Wed, 14 Aug 2019 12:20:58 +0000 (+0200) Subject: validate: do not validate devices or lvm_volumes in osd_auto_discovery case X-Git-Tag: v3.2.25~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af1f41bbd979bc06dc19a2a4fbedde50f7112c71;p=ceph-ansible.git 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 (cherry picked from commit 243edfbc963baa68af0e0acf8489c4b920f57c1a) --- diff --git a/plugins/actions/validate.py b/plugins/actions/validate.py index f990d8340..8ca428cc5 100644 --- 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))