Revision a8e8c0c6

b/Makefile.am
1381 1381 
	  echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \
1382 1382 
	  echo "ES_SEARCH_PATH = [$(ES_SEARCH_PATH)]"; \
1383 1383 
	  echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
1384 
	  echo "XEN_CONFIG_DIR = '$(XEN_CONFIG_DIR)'"; \
1384 1385 
	  echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \
1385 1386 
	  echo "XEN_INITRD = '$(XEN_INITRD)'"; \
1386 1387 
	  echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \
......
1497 1498 
	  echo 's#@''GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
1498 1499 
	  echo 's#@''CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \
1499 1500 
	  echo 's#@''MODULES@#$(strip $(lint_python_code))#g'; \
1501 
	  echo 's#@''XEN_CONFIG_DIR@#$(XEN_CONFIG_DIR)#g'; \
1500 1502 
	  echo; \
1501 1503 
	  echo '/^@SHELL_ENV_INIT@$$/ {'; \
1502 1504 
	  echo '  r $(SHELL_ENV_INIT)'; \
b/configure.ac
49 49 
  [ssh_config_dir="/etc/ssh"])
50 50 
AC_SUBST(SSH_CONFIG_DIR, $ssh_config_dir)
51 51 

  		





  
  52
  
    
# --with-xen-config-dir=...


  		





  
  53
  
    
AC_ARG_WITH([xen-config-dir],


  		





  
  54
  
    
  [AS_HELP_STRING([--with-xen-config-dir=DIR],


  		





  
  55
  
    
                  m4_normalize([Xen configuration directory


  		





  
  56
  
    
                                (default: /etc/xen)]))],


  		





  
  57
  
    
  [xen_config_dir="$withval"],


  		





  
  58
  
    
  [xen_config_dir=/etc/xen])


  		





  
  59
  
    
AC_SUBST(XEN_CONFIG_DIR, $xen_config_dir)


  		





  
  60
  
    

  		





  52
  61
  
    
# --with-os-search-path=...


  		





  53
  62
  
    
# do a bit of black sed magic to for quoting of the strings in the list


  		





  54
  63
  
    
AC_ARG_WITH([os-search-path],


  		












  

    
      b/lib/hypervisor/hv_xen.py
    
  






  33
  33
  
    
from ganeti import netutils


  		





  34
  34
  
    
from ganeti import objects


  		





  35
  35
  
    
from ganeti import pathutils


  		





  36
  
  
    
from ganeti import vcluster


  		





  37
  36
  
    
from ganeti import ssconf


  		





  38
  37
  
    

  		





  39
  38
  
    

  		





  40
  
  
    
XEND_CONFIG_FILE = vcluster.AddNodePrefix("/etc/xen/xend-config.sxp")


  		





  41
  
  
    
XL_CONFIG_FILE = vcluster.AddNodePrefix("/etc/xen/xl.conf")


  		





  42
  
  
    
VIF_BRIDGE_SCRIPT = vcluster.AddNodePrefix("/etc/xen/scripts/vif-bridge")


  		





  
  39
  
    
XEND_CONFIG_FILE = utils.PathJoin(pathutils.XEN_CONFIG_DIR, "xend-config.sxp")


  		





  
  40
  
    
XL_CONFIG_FILE = utils.PathJoin(pathutils.XEN_CONFIG_DIR, "xen/xl.conf")


  		





  
  41
  
    
VIF_BRIDGE_SCRIPT = utils.PathJoin(pathutils.XEN_CONFIG_DIR,


  		





  
  42
  
    
                                   "scripts/vif-bridge")


  		





  43
  43
  
    
_DOM0_NAME = "Domain-0"


  		





  44
  44
  
    

  		





  45
  45
  
    

  		





  ......




  73
  73
  
    
    @rtype: str


  		





  74
  74
  
    

  		





  75
  75
  
    
    """


  		





  76
  
  
    
    return "/etc/xen/%s" % instance_name


  		





  
  76
  
    
    return utils.PathJoin(pathutils.XEN_CONFIG_DIR, instance_name)


  		





  77
  77
  
    

  		





  78
  78
  
    
  @classmethod


  		





  79
  79
  
    
  def _WriteConfigFile(cls, instance, startup_memory, block_devices):


  		





  ......




  90
  90
  
    

  		





  91
  91
  
    
    """


  		





  92
  92
  
    
    # just in case it exists


  		





  93
  
  
    
    utils.RemoveFile("/etc/xen/auto/%s" % instance_name)


  		





  
  93
  
    
    utils.RemoveFile(utils.PathJoin(pathutils.XEN_CONFIG_DIR, "auto",


  		





  
  94
  
    
                                    instance_name))


  		





  
  95
  
    

  		





  94
  96
  
    
    cfg_file = XenHypervisor._ConfigFileName(instance_name)


  		





  95
  97
  
    
    try:


  		





  96
  98
  
    
      utils.WriteFile(cfg_file, data=data)


  		












  

    
      b/lib/pathutils.py
    
  






  36
  36
  
    
OS_SEARCH_PATH = _autoconf.OS_SEARCH_PATH


  		





  37
  37
  
    
ES_SEARCH_PATH = _autoconf.ES_SEARCH_PATH


  		





  38
  38
  
    
SSH_CONFIG_DIR = _autoconf.SSH_CONFIG_DIR


  		





  
  39
  
    
XEN_CONFIG_DIR = vcluster.AddNodePrefix(_autoconf.XEN_CONFIG_DIR)


  		





  39
  40
  
    
SYSCONFDIR = vcluster.AddNodePrefix(_autoconf.SYSCONFDIR)


  		





  40
  41
  
    
TOOLSDIR = _autoconf.TOOLSDIR


  		





  41
  42
  
    
LOCALSTATEDIR = vcluster.AddNodePrefix(_autoconf.LOCALSTATEDIR)


  		












  

    
      b/man/gnt-cluster.rst
    
  






  302
  302
  
    

  		





  303
  303
  
    
    This options specifies the TCP port to use for live-migration. For


  		





  304
  304
  
    
    Xen, the same port should be configured on all nodes in the


  		





  305
  
  
    
    ``/etc/xen/xend-config.sxp`` file, under the key


  		





  
  305
  
    
    ``@XEN_CONFIG_DIR@/xend-config.sxp`` file, under the key


  		





  306
  306
  
    
    "xend-relocation-port".


  		





  307
  307
  
    

  		





  308
  308
  
    
migration\_bandwidth


  		












Also available in:
  Unified diff