Merge "Default to xenserver driver if xenserver-core is installed"

This commit is contained in:
Jenkins 2013-08-10 11:13:56 +00:00 committed by Gerrit Code Review
commit e0d4aebe7a

View File

@ -180,8 +180,11 @@ SPICE_BRANCH=${SPICE_BRANCH:-master}
# Nova hypervisor configuration. We default to libvirt with **kvm** but will # Nova hypervisor configuration. We default to libvirt with **kvm** but will
# drop back to **qemu** if we are unable to load the kvm module. ``stack.sh`` can # drop back to **qemu** if we are unable to load the kvm module. ``stack.sh`` can
# also install an **LXC**, **OpenVZ** or **XenAPI** based system. # also install an **LXC**, **OpenVZ** or **XenAPI** based system. If xenserver-core
VIRT_DRIVER=${VIRT_DRIVER:-libvirt} # is installed, the default will be XenAPI
DEFAULT_VIRT_DRIVER=libvirt
is_package_installed xenserver-core && DEFAULT_VIRT_DRIVER=xenserver
VIRT_DRIVER=${VIRT_DRIVER:-$DEFAULT_VIRT_DRIVER}
case "$VIRT_DRIVER" in case "$VIRT_DRIVER" in
libvirt) libvirt)
LIBVIRT_TYPE=${LIBVIRT_TYPE:-kvm} LIBVIRT_TYPE=${LIBVIRT_TYPE:-kvm}