From 95a39a7787ae5a91e2e64575f74ed8c3b5ff4762 Mon Sep 17 00:00:00 2001
From: Andrea Spadaccini <spadaccio@google.com>
Date: Wed, 2 Nov 2011 13:31:52 +0000
Subject: [PATCH] Fix overriding of ActivateMasterIp params
In the process of reworking the patches for master, I forgot to remove a
call to GetMasterInfo() that overrides the parameters passed via RPC.
This patch fixes this issue.
Signed-off-by: Andrea Spadaccini <spadaccio@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/backend.py | 3 ---
1 file changed, 3 deletions(-)
diff --git a/lib/backend.py b/lib/backend.py
index 84a936896..c1c205daf 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -310,9 +310,6 @@ def ActivateMasterIp(master_ip, master_netmask, master_netdev, family):
@param family: the IP family
"""
- # GetMasterInfo will raise an exception if not able to return data
- master_netdev, master_ip, _, family, master_netmask = GetMasterInfo()
-
err_msg = None
if netutils.TcpPing(master_ip, constants.DEFAULT_NODED_PORT):
if netutils.IPAddress.Own(master_ip):
--
GitLab