openstack/devstack
Code Issues Proposed changes

Merge "libvirt virt_type=parallels support enchancement"

Browse Source
This commit is contained in:
Jenkins 2015-07-21 04:58:31 +00:00 committed by Gerrit Code Review
commit d9b425df06
2 changed files with 8 additions and 2 deletions

6
functions-common

@ -270,8 +270,9 @@ function GetOSVersion {
# Fedora release 16 (Verne) # Fedora release 16 (Verne)
# XenServer release 6.2.0-70446c (xenenterprise) # XenServer release 6.2.0-70446c (xenenterprise)
# Oracle Linux release 7 # Oracle Linux release 7
# CloudLinux release 7.1
os_CODENAME="" os_CODENAME=""
for r in "Red Hat" CentOS Fedora XenServer; do for r in "Red Hat" CentOS Fedora XenServer CloudLinux; do
os_VENDOR=$r os_VENDOR=$r
if [[ -n "`grep \"$r\" /etc/redhat-release`" ]]; then if [[ -n "`grep \"$r\" /etc/redhat-release`" ]]; then
ver=`sed -e 's/^.* \([0-9].*\) (\(.*\)).*$/\1\|\2/' /etc/redhat-release` ver=`sed -e 's/^.* \([0-9].*\) (\(.*\)).*$/\1\|\2/' /etc/redhat-release`
@ -375,7 +376,8 @@ function is_fedora {
fi fi
[ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \ [ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \
[ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleLinux" ] [ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleLinux" ] || \
[ "$os_VENDOR" = "CloudLinux" ]
} }

4
lib/nova_plugins/hypervisor-libvirt

@ -64,6 +64,10 @@ function configure_nova_hypervisor {
if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then
iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system" iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system"
iniset $NOVA_CONF libvirt images_type "ploop" iniset $NOVA_CONF libvirt images_type "ploop"
iniset $NOVA_CONF DEFAULT force_raw_images "False"
iniset $NOVA_CONF DEFAULT vncserver_proxyclient_address $HOST_IP
iniset $NOVA_CONF DEFAULT vncserver_listen $HOST_IP
iniset $NOVA_CONF DEFAULT vnc_keymap
fi fi
} }