openstack/devstack
Code Issues Proposed changes

Move hypervisor-specific code into a case statement

Browse Source 
Change-Id: Id799506f180ac81d493f49de140cc079338430aa
This commit is contained in:
Bob Ball 2013-05-16 14:27:01 +01:00
parent 9f52cd78f2
commit 337bd8176f
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
stackrc
View File

@ -164,14 +164,25 @@ PBR_BRANCH=${PBR_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** or **OpenVZ** based system. # also install an **LXC**, **OpenVZ** or **XenAPI** based system.
VIRT_DRIVER=${VIRT_DRIVER:-libvirt} VIRT_DRIVER=${VIRT_DRIVER:-libvirt}
LIBVIRT_TYPE=${LIBVIRT_TYPE:-kvm} case "$VIRT_DRIVER" in
if [[ "$os_VENDOR" =~ (Debian) ]]; then libvirt)
LIBVIRT_GROUP=libvirt LIBVIRT_TYPE=${LIBVIRT_TYPE:-kvm}
else if [[ "$os_VENDOR" =~ (Debian) ]]; then
LIBVIRT_GROUP=libvirtd LIBVIRT_GROUP=libvirt
fi else
LIBVIRT_GROUP=libvirtd
fi
;;
xenserver)
# Xen config common to nova and quantum
XENAPI_CONNECTION_URL=${XENAPI_CONNECTION_URL:-"http://169.254.0.1"}
XENAPI_USER=${XENAPI_USER:-"root"}
;;
*)
;;
esac
# Specify a comma-separated list of UEC images to download and install into glance. # Specify a comma-separated list of UEC images to download and install into glance.
# supported urls here are: # supported urls here are:
@ -234,10 +245,6 @@ PUBLIC_NETWORK_NAME=${PUBLIC_NETWORK_NAME:-"public"}
# Compatibility until it's eradicated from CI # Compatibility until it's eradicated from CI
USE_SCREEN=${SCREEN_DEV:-$USE_SCREEN} USE_SCREEN=${SCREEN_DEV:-$USE_SCREEN}
# Xen config common to nova and quantum
XENAPI_CONNECTION_URL=${XENAPI_CONNECTION_URL:-"http://169.254.0.1"}
XENAPI_USER=${XENAPI_USER:-"root"}
# Local variables: # Local variables:
# mode: shell-script # mode: shell-script
# End: # End: