Commit edea391e authored by Andrea Spadaccini's avatar Andrea Spadaccini
Browse files

Reapply commit 2a6de57a after merge

In the last merge I erroneously discarded the changes introduced by
commit 2a6de57a

 "Check the results of master IP RPCs". This commit
reintroduces them.
Signed-off-by: default avatarAndrea Spadaccini <spadaccio@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent f73e5568
......@@ -3983,8 +3983,9 @@ class LUClusterActivateMasterIp(NoHooksLU):
"""
master_params = self.cfg.GetMasterNetworkParameters()
ems = self.cfg.GetUseExternalMipScript()
self.rpc.call_node_activate_master_ip(master_params.name,
master_params, ems)
result = self.rpc.call_node_activate_master_ip(master_params.name,
master_params, ems)
result.Raise("Could not activate the master IP")
class LUClusterDeactivateMasterIp(NoHooksLU):
......@@ -3997,8 +3998,9 @@ class LUClusterDeactivateMasterIp(NoHooksLU):
"""
master_params = self.cfg.GetMasterNetworkParameters()
ems = self.cfg.GetUseExternalMipScript()
self.rpc.call_node_deactivate_master_ip(master_params.name, master_params,
ems)
result = self.rpc.call_node_deactivate_master_ip(master_params.name,
master_params, ems)
result.Raise("Could not deactivate the master IP")
def _WaitForSync(lu, instance, disks=None, oneshot=False):
......
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