Commit 19e1b715 authored by Iustin Pop's avatar Iustin Pop
Browse files

Return master ip script output in case of failure



Currently only the exit code is returned, which is somewhat pointless:
for failures, we already know it's ≠ 0, so we don't have enough
information (reported on the mailing list). By logging the output as
well (if any), the user will have more information available for
debugging.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent d9a900dc
...@@ -358,8 +358,8 @@ def _RunMasterSetupScript(master_params, action, use_external_mip_script): ...@@ -358,8 +358,8 @@ def _RunMasterSetupScript(master_params, action, use_external_mip_script):
result = utils.RunCmd([setup_script, action], env=env, reset_env=True) result = utils.RunCmd([setup_script, action], env=env, reset_env=True)
if result.failed: if result.failed:
_Fail("Failed to %s the master IP. Script return value: %s" % _Fail("Failed to %s the master IP. Script return value: %s, output: '%s'" %
(action, result.exit_code), log=True) (action, result.exit_code, result.output), log=True)
@RunLocalHooks(constants.FAKE_OP_MASTER_TURNUP, "master-ip-turnup", @RunLocalHooks(constants.FAKE_OP_MASTER_TURNUP, "master-ip-turnup",
......
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