As introduced by commit 77807d83 and d388e30c6d and was not caught during the code review process.
Signed-off-by: Federico Morg Pareschi <[email protected]> --- lib/cmdlib/instance_set_params.py | 6 +++--- tools/move-instance | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/cmdlib/instance_set_params.py b/lib/cmdlib/instance_set_params.py index d443c9cdb..228f8aa3c 100644 --- a/lib/cmdlib/instance_set_params.py +++ b/lib/cmdlib/instance_set_params.py @@ -994,9 +994,9 @@ class LUInstanceSetParams(LogicalUnit): else self.instance.os) if compat.any( - self.op.osparams, self.op.osparams_private, - self.op.clear_osparams, self.op.clear_osparams_private, - self.op.remove_osparams, self.op.remove_osparams_private): + [self.op.osparams, self.op.osparams_private, + self.op.clear_osparams, self.op.clear_osparams_private, + self.op.remove_osparams, self.op.remove_osparams_private]): public_parms = self.op.osparams or {} private_parms = self.op.osparams_private or {} remove_osparams = self.op.remove_osparams or [] diff --git a/tools/move-instance b/tools/move-instance index 5f3336372..b801f671d 100755 --- a/tools/move-instance +++ b/tools/move-instance @@ -943,9 +943,9 @@ def _CheckInstanceOptions(parser, options, instance_names): options.nics = cli.ParseNicOption(options.nics) else: # Moving more than one instance - if compat.any(options.dest_instance_name, options.dest_primary_node, - options.dest_secondary_node, options.hvparams, - options.beparams, options.osparams, options.nics): + if compat.any([options.dest_instance_name, options.dest_primary_node, + options.dest_secondary_node, options.hvparams, + options.beparams, options.osparams, options.nics]): parser.error("The options --dest-instance-name, --dest-primary-node," " --dest-secondary-node, --hypervisor-parameters," " --backend-parameters, --os-parameters and --net can" -- 2.11.0.390.gc69c2f50cf-goog
