There is currently no way to reset oob_program back to its default from the cmdline. By changing the default to the empty string gnt-cluster modify --node-parameters oob_program= now works.
Signed-off-by: Stephen Shirley <[email protected]> --- lib/constants.py | 4 ++-- tools/cfgupgrade | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/constants.py b/lib/constants.py index 8047726..0c115b3 100644 --- a/lib/constants.py +++ b/lib/constants.py @@ -668,7 +668,7 @@ BES_PARAMETERS = frozenset(BES_PARAMETER_TYPES.keys()) ND_OOB_PROGRAM = "oob_program" NDS_PARAMETER_TYPES = { - ND_OOB_PROGRAM: VTYPE_MAYBE_STRING, + ND_OOB_PROGRAM: VTYPE_STRING, } NDS_PARAMETERS = frozenset(NDS_PARAMETER_TYPES.keys()) @@ -1148,7 +1148,7 @@ BEC_DEFAULTS = { } NDC_DEFAULTS = { - ND_OOB_PROGRAM: None, + ND_OOB_PROGRAM: "", } NICC_DEFAULTS = { diff --git a/tools/cfgupgrade b/tools/cfgupgrade index 2222920..95d5901 100755 --- a/tools/cfgupgrade +++ b/tools/cfgupgrade @@ -179,7 +179,10 @@ def main(): config_data["version"] = constants.BuildVersion(2, 4, 0) elif config_major == 2 and config_minor == 4: - logging.info("No changes necessary") + if config_data["cluster"]["ndparams"]["oob_program"] is None: + config_data["cluster"]["ndparams"]["oob_program"] = "" + else: + logging.info("No changes necessary") else: raise Error("Configuration version %d.%d.%d not supported by this tool" % -- 1.7.3.1
