Revision 31821208

b/lib/cmdlib.py
2431 2431 
                                 " for remote verification" % verifier)
2432 2432 
      if result[verifier].data['nodelist']:
2433 2433 
        for failed in result[verifier].data['nodelist']:
2434 
          feedback_fn("ssh/hostname verification failed %s -> %s" %
2434 
          feedback_fn("ssh/hostname verification failed"
2435 
                      " (checking from %s): %s" %
2435 2436 
                      (verifier, result[verifier].data['nodelist'][failed]))
2436 2437 
        raise errors.OpExecError("ssh/hostname verification failed.")
2437 2438 

  		












  

    
      b/lib/ssh.py
    
  






  227
  227
  
    
    remotehostname = retval.stdout.strip()


  		





  228
  228
  
    

  		





  229
  229
  
    
    if not remotehostname or remotehostname != node:


  		





  230
  
  
    
      return False, "hostname mismatch, got %s" % remotehostname


  		





  
  230
  
    
      if node.startswith(remotehostname + "."):


  		





  
  231
  
    
        msg = "hostname not FQDN"


  		





  
  232
  
    
      else:


  		





  
  233
  
    
        msg = "hostname mistmatch"


  		





  
  234
  
    
      return False, ("%s: expected %s but got %s" %


  		





  
  235
  
    
                     (msg, node, remotehostname))


  		





  231
  236
  
    

  		





  232
  237
  
    
    return True, "host matches"


  		





  233
  238
  
    

  		












Also available in:
  Unified diff