Revision 396b5733

b/lib/backend.py
193 193
  # GetMasterInfo will raise an exception if not able to return data
194 194
  master_netdev, master_ip, _ = GetMasterInfo()
195 195

  
196
  payload = []
196
  err_msgs = []
197 197
  if utils.TcpPing(master_ip, constants.DEFAULT_NODED_PORT):
198 198
    if utils.OwnIpAddress(master_ip):
199 199
      # we already have the ip:
......
201 201
    else:
202 202
      msg = "Someone else has the master ip, not activating"
203 203
      logging.error(msg)
204
      payload.append(msg)
204
      err_msgs.append(msg)
205 205
  else:
206 206
    result = utils.RunCmd(["ip", "address", "add", "%s/32" % master_ip,
207 207
                           "dev", master_netdev, "label",
......
209 209
    if result.failed:
210 210
      msg = "Can't activate master IP: %s" % result.output
211 211
      logging.error(msg)
212
      payload.append(msg)
212
      err_msgs.append(msg)
213 213

  
214 214
    result = utils.RunCmd(["arping", "-q", "-U", "-c 3", "-I", master_netdev,
215 215
                           "-s", master_ip, master_ip])
......
222 222
      if result.failed:
223 223
        msg = "Can't start daemon %s: %s" % (daemon, result.output)
224 224
        logging.error(msg)
225
        payload.append(msg)
225
        err_msgs.append(msg)
226 226

  
227
  if payload:
228
    _Fail("; ".join(payload))
227
  if err_msgs:
228
    _Fail("; ".join(err_msgs))
229 229

  
230 230

  
231 231
def StopMaster(stop_daemons):

Also available in: Unified diff