Revision 7e1fac25

b/Makefile.am
408 408 
	  echo "VERSION_FULL = '$(VERSION_FULL)'"; \
409 409 
	  echo "LOCALSTATEDIR = '$(localstatedir)'"; \
410 410 
	  echo "SYSCONFDIR = '$(sysconfdir)'"; \
411 
	  echo "SSH_INITD_SCRIPT = '$(SSH_INITD_SCRIPT)'"; \
412 411 
	  echo "EXPORT_DIR = '$(EXPORT_DIR)'"; \
413 412 
	  echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \
414 413 
	  echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
......
437 436 
	  echo 's#@CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \
438 437 
	  echo 's#@CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \
439 438 
	  echo 's#@RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \
439 
	  echo 's#@RPL_SSH_INITD_SCRIPT@#$(SSH_INITD_SCRIPT)#g'; \
440 440 
	  echo 's#@PKGLIBDIR@#$(pkglibdir)#g'; \
441 441 
	} > $@
442 442 

  		












  

    
      b/daemons/daemon-util.in
    
  






  104
  104
  
    
  stop ganeti-masterd


  		





  105
  105
  
    
}


  		





  106
  106
  
    

  		





  
  107
  
    
# Reloads the SSH keys


  		





  
  108
  
    
reload_ssh_keys() {


  		





  
  109
  
    
  @RPL_SSH_INITD_SCRIPT@ restart


  		





  
  110
  
    
}


  		





  
  111
  
    

  		





  107
  112
  
    
if [[ "$#" -lt 1 ]]; then


  		





  108
  113
  
    
  echo "Usage: $0 <action>" >&2


  		





  109
  114
  
    
  exit 1


  		












  

    
      b/lib/backend.py
    
  






  355
  355
  
    

  		





  356
  356
  
    
  utils.AddAuthorizedKey(auth_keys, sshpub)


  		





  357
  357
  
    

  		





  358
  
  
    
  utils.RunCmd([constants.SSH_INITD_SCRIPT, "restart"])


  		





  
  358
  
    
  result = utils.RunCmd([constants.DAEMON_UTIL, "reload-ssh-keys"])


  		





  
  359
  
    
  if result.failed:


  		





  
  360
  
    
    _Fail("Unable to reload SSH keys (command %r, exit code %s, output %r)",


  		





  
  361
  
    
          result.cmd, result.exit_code, result.output)


  		





  359
  362
  
    

  		





  360
  363
  
    

  		





  361
  364
  
    
def LeaveCluster(modify_ssh_setup):


  		












  

    
      b/lib/constants.py
    
  






  338
  338
  
    
OS_VARIANTS_FILE = 'variants.list'


  		





  339
  339
  
    

  		





  340
  340
  
    
# ssh constants


  		





  341
  
  
    
SSH_INITD_SCRIPT = _autoconf.SSH_INITD_SCRIPT


  		





  342
  341
  
    
SSH_CONFIG_DIR = "/etc/ssh/"


  		





  343
  342
  
    
SSH_HOST_DSA_PRIV = SSH_CONFIG_DIR + "ssh_host_dsa_key"


  		





  344
  343
  
    
SSH_HOST_DSA_PUB = SSH_HOST_DSA_PRIV + ".pub"


  		












Also available in:
  Unified diff