Revision 6f68a739 lib/cmdlib.py

b/lib/cmdlib.py
1022 1022

  
1023 1023
    for node_i in nodeinfo:
1024 1024
      node = node_i.name
1025
      nresult = all_nvinfo[node].data
1026 1025

  
1027 1026
      if node_i.offline:
1028 1027
        feedback_fn("* Skipping offline node %s" % (node,))
......
1040 1039
        ntype = "regular"
1041 1040
      feedback_fn("* Verifying node %s (%s)" % (node, ntype))
1042 1041

  
1043
      if all_nvinfo[node].failed or not isinstance(nresult, dict):
1044
        feedback_fn("  - ERROR: connection to %s failed" % (node,))
1042
      msg = all_nvinfo[node].RemoteFailMsg()
1043
      if msg:
1044
        feedback_fn("  - ERROR: while contacting node %s: %s" % (node, msg))
1045 1045
        bad = True
1046 1046
        continue
1047 1047

  
1048
      nresult = all_nvinfo[node].payload
1048 1049
      node_drbd = {}
1049 1050
      for minor, instance in all_drbd_map[node].items():
1050 1051
        if instance not in instanceinfo:
......
2336 2337
    result = self.rpc.call_node_verify(node_verify_list, node_verify_param,
2337 2338
                                       self.cfg.GetClusterName())
2338 2339
    for verifier in node_verify_list:
2339
      if result[verifier].failed or not result[verifier].data:
2340
        raise errors.OpExecError("Cannot communicate with %s's node daemon"
2341
                                 " for remote verification" % verifier)
2342
      if result[verifier].data['nodelist']:
2343
        for failed in result[verifier].data['nodelist']:
2340
      msg = result[verifier].RemoteFailMsg()
2341
      if msg:
2342
        raise errors.OpExecError("Cannot communicate with node %s: %s" %
2343
                                 (verifier, msg))
2344
      nl_payload = result[verifier].payload['nodelist']
2345
      if nl_payload:
2346
        for failed in nl_payload:
2344 2347
          feedback_fn("ssh/hostname verification failed %s -> %s" %
2345
                      (verifier, result[verifier].data['nodelist'][failed]))
2348
                      (verifier, nl_payload[failed]))
2346 2349
        raise errors.OpExecError("ssh/hostname verification failed.")
2347 2350

  
2348 2351
    if self.op.readd:

Also available in: Unified diff