Commit 43f5ea7a authored by Guido Trotter's avatar Guido Trotter
Browse files

Fix iallocator run

The rpc library returns a list, not a tuple, so we'll accept both.

Reviewed-by: iustinp
parent dcde0241
...@@ -5109,7 +5109,7 @@ class IAllocator(object): ...@@ -5109,7 +5109,7 @@ class IAllocator(object):
result = call_fn(self.sstore.GetMasterNode(), name, self.in_text) result = call_fn(self.sstore.GetMasterNode(), name, self.in_text)
if not isinstance(result, tuple) or len(result) != 4: if not isinstance(result, (list, tuple)) or len(result) != 4:
raise errors.OpExecError("Invalid result from master iallocator runner") raise errors.OpExecError("Invalid result from master iallocator runner")
rcode, stdout, stderr, fail = result rcode, stdout, stderr, fail = result
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment