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/4352/head
Guillaume Abrioux 2019-08-14 14:20:58 +02:00
parent 6fa0eb90a2
commit 3fc880ee7a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/actions/validate.py
View File

@ -93,16 +93,16 @@ class ActionModule(ActionBase):
if host_vars["osd_group_name"] in host_vars["group_names"]: if host_vars["osd_group_name"] in host_vars["group_names"]:
notario.validate(host_vars, osd_options, defined_keys=True) notario.validate(host_vars, osd_options, defined_keys=True)
notario_store['osd_objectstore'] = host_vars["osd_objectstore"] notario_store['osd_objectstore'] = host_vars["osd_objectstore"]
if not host_vars.get('osd_auto_discovery'):
if host_vars.get("devices"): if host_vars.get("devices"):
notario.validate( notario.validate(
host_vars, lvm_batch_scenario, defined_keys=True) host_vars, lvm_batch_scenario, defined_keys=True)
elif notario_store['osd_objectstore'] == 'filestore': elif notario_store['osd_objectstore'] == 'filestore':
notario.validate( notario.validate(
host_vars, lvm_filestore_scenario, defined_keys=True) # noqa E501 host_vars, lvm_filestore_scenario, defined_keys=True) # noqa E501
elif notario_store['osd_objectstore'] == 'bluestore': elif notario_store['osd_objectstore'] == 'bluestore':
notario.validate( notario.validate(
host_vars, lvm_bluestore_scenario, defined_keys=True) # noqa E501 host_vars, lvm_bluestore_scenario, defined_keys=True) # noqa E501
except Invalid as error: except Invalid as error:
display.vvvv("Notario Failure: %s" % str(error)) display.vvvv("Notario Failure: %s" % str(error))