From 760a1afc218c6aa1080821db76dc92ad5fdbd83e Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Mon, 30 Apr 2018 13:08:49 -0500 Subject: [PATCH] validate: only validate osd config options on osd hosts Signed-off-by: Andrew Schoen --- plugins/actions/validate.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/plugins/actions/validate.py b/plugins/actions/validate.py index f60e35f08..744901ef0 100644 --- a/plugins/actions/validate.py +++ b/plugins/actions/validate.py @@ -61,16 +61,17 @@ class ActionModule(ActionBase): notario.validate(host_vars, rados_options, defined_keys=True) # validate osd scenario setup - 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 host_vars["osd_group_name"] in host_vars["group_names"]: + 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 host_vars["osd_scenario"] == "non-collocated": - notario.validate(host_vars, non_collocated_osd_scenario, defined_keys=True) + if host_vars["osd_scenario"] == "non-collocated": + notario.validate(host_vars, non_collocated_osd_scenario, defined_keys=True) - if host_vars["osd_scenario"] == "lvm": - notario.validate(host_vars, lvm_osd_scenario, defined_keys=True) + if host_vars["osd_scenario"] == "lvm": + notario.validate(host_vars, lvm_osd_scenario, defined_keys=True) except Invalid as error: display.vvvv("Notario Failure: %s" % str(error)) -- 2.39.5