diff --git a/functions-common b/functions-common index 322bf82f30..be1ebb9285 100644 --- a/functions-common +++ b/functions-common @@ -270,8 +270,9 @@ function GetOSVersion { # Fedora release 16 (Verne) # XenServer release 6.2.0-70446c (xenenterprise) # Oracle Linux release 7 + # CloudLinux release 7.1 os_CODENAME="" - for r in "Red Hat" CentOS Fedora XenServer; do + for r in "Red Hat" CentOS Fedora XenServer CloudLinux; do os_VENDOR=$r if [[ -n "`grep \"$r\" /etc/redhat-release`" ]]; then ver=`sed -e 's/^.* \([0-9].*\) (\(.*\)).*$/\1\|\2/' /etc/redhat-release` @@ -375,7 +376,8 @@ function is_fedora { fi [ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \ - [ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleLinux" ] + [ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleLinux" ] || \ + [ "$os_VENDOR" = "CloudLinux" ] } diff --git a/lib/nova_plugins/hypervisor-libvirt b/lib/nova_plugins/hypervisor-libvirt index f52629dc91..c54a7166a0 100644 --- a/lib/nova_plugins/hypervisor-libvirt +++ b/lib/nova_plugins/hypervisor-libvirt @@ -64,6 +64,10 @@ function configure_nova_hypervisor { if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system" 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 }