Revision d512e84b

b/lib/cli.py
1665 1665 
        # All daemons are shut down now
1666 1666 
        try:
1667 1667 
          return fn(self, *args)
1668 
        except Exception:
1668 
        except Exception, err:
1669 
          _, errmsg = FormatError(err)
1669 1670 
          logging.exception("Caught exception")
1671 
          self.feedback_fn(errmsg)
1670 1672 
          raise
1671 1673 
      finally:
1672 1674 
        # Start cluster again, master node last
b/scripts/gnt-cluster
510 510 
  @param force: Whether to ask user for confirmation
511 511 

  		





  512
  512
  
    
  """


  		





  513
  
  
    
  assert (new_cluster_cert or new_rapi_cert or rapi_cert_filename or


  		





  514
  
  
    
          new_confd_hmac_key)


  		





  515
  
  
    

  		





  516
  513
  
    
  if new_rapi_cert and rapi_cert_filename:


  		





  517
  514
  
    
    ToStderr("Only one of the --new-rapi-certficate and --rapi-certificate"


  		





  518
  515
  
    
             " options can be specified at the same time.")


  		












Also available in:
  Unified diff