ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 243edfbc96)
pull/4369/head
Guillaume Abrioux 2019-08-14 14:20:58 +02:00
parent 787a6e879e
commit af1f41bbd9
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/actions/validate.py
View File

@ -91,12 +91,13 @@ class ActionModule(ActionBase):
notario.validate(host_vars, non_collocated_osd_scenario, defined_keys=True) notario.validate(host_vars, non_collocated_osd_scenario, defined_keys=True)
if host_vars["osd_scenario"] == "lvm": if host_vars["osd_scenario"] == "lvm":
if host_vars.get("devices"): if not host_vars.get("osd_auto_discovery", False):
notario.validate(host_vars, lvm_batch_scenario, defined_keys=True) if host_vars.get("devices"):
elif notario_store['osd_objectstore'] == 'filestore': notario.validate(host_vars, lvm_batch_scenario, defined_keys=True)
notario.validate(host_vars, lvm_filestore_scenario, defined_keys=True) elif notario_store['osd_objectstore'] == 'filestore':
elif notario_store['osd_objectstore'] == 'bluestore': notario.validate(host_vars, lvm_filestore_scenario, defined_keys=True)
notario.validate(host_vars, lvm_bluestore_scenario, defined_keys=True) elif notario_store['osd_objectstore'] == 'bluestore':
notario.validate(host_vars, lvm_bluestore_scenario, defined_keys=True)
except Invalid as error: except Invalid as error:
display.vvvv("Notario Failure: %s" % str(error)) display.vvvv("Notario Failure: %s" % str(error))