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

validate: support validation of osd_auto_discovery 

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
pull/2619/head
Andrew Schoen 2018-05-09 13:36:35 -05:00 committed by Guillaume Abrioux
parent 8b6097e565
commit cf2868f0d1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/actions/validate.py
View File

@ -75,7 +75,8 @@ class ActionModule(ActionBase):
notario.validate(host_vars, osd_options, defined_keys=True)
notario_store['osd_objectstore'] = host_vars["osd_objectstore"]
if host_vars["osd_scenario"] == "collocated":
notario.validate(host_vars, collocated_osd_scenario, defined_keys=True)
if not host_vars.get("osd_auto_discovery", False):
notario.validate(host_vars, collocated_osd_scenario, defined_keys=True)
if host_vars["osd_scenario"] == "non-collocated":
notario.validate(host_vars, non_collocated_osd_scenario, defined_keys=True)
@ -169,6 +170,7 @@ def validate_rados_options(value):
assert any([radosgw_address_given, radosgw_address_block_given, radosgw_interface_given]), msg
install_options = (
("ceph_origin", ceph_origin_choices),
("containerized_deployment", types.boolean),
@ -211,6 +213,7 @@ rados_options = (
osd_options = (
(optional("dmcrypt"), types.boolean),
(optional("osd_auto_discovery"), types.boolean),
("osd_scenario", validate_osd_scenarios),
)