Revision 909b3a0e lib/backend.py

b/lib/backend.py
231 231
  for consumption here or from the node daemon.
232 232

  
233 233
  @rtype: tuple
234
  @return: master_netdev, master_ip, master_netmask, master_name,
235
    primary_ip_family
234
  @return: master_netdev, master_ip, master_name, primary_ip_family,
235
    master_netmask
236 236
  @raise RPCFail: in case of errors
237 237

  
238 238
  """
......
245 245
    primary_ip_family = cfg.GetPrimaryIPFamily()
246 246
  except errors.ConfigurationError, err:
247 247
    _Fail("Cluster configuration incomplete: %s", err, exc=True)
248
  return (master_netdev, master_ip, master_netmask, master_node,
249
          primary_ip_family)
248
  return (master_netdev, master_ip, master_node, primary_ip_family,
249
      master_netmask)
250 250

  
251 251

  
252 252
def ActivateMasterIp():
......
254 254

  
255 255
  """
256 256
  # GetMasterInfo will raise an exception if not able to return data
257
  master_netdev, master_ip, master_netmask, _, family = GetMasterInfo()
257
  master_netdev, master_ip, _, family, master_netmask = GetMasterInfo()
258 258

  
259 259
  err_msg = None
260 260
  if netutils.TcpPing(master_ip, constants.DEFAULT_NODED_PORT):
......
328 328
  # need to decide in which case we fail the RPC for this
329 329

  
330 330
  # GetMasterInfo will raise an exception if not able to return data
331
  master_netdev, master_ip, master_netmask, _, _ = GetMasterInfo()
331
  master_netdev, master_ip, _, _, master_netmask = GetMasterInfo()
332 332

  
333 333
  result = utils.RunCmd([constants.IP_COMMAND_PATH, "address", "del",
334 334
                         "%s/%s" % (master_ip, master_netmask),
......
360 360
  """Change the netmask of the master IP.
361 361

  
362 362
  """
363
  master_netdev, master_ip, old_netmask, _, _ = GetMasterInfo()
363
  master_netdev, master_ip, _, _, old_netmask = GetMasterInfo()
364 364
  if old_netmask == netmask:
365 365
    return
366 366

  

Also available in: Unified diff