From e6f37b91e5cd5b0f70d2be1e75eb4f61adc1e16a Mon Sep 17 00:00:00 2001 From: Maxim Nestratov Date: Tue, 30 Jun 2015 14:54:12 +0300 Subject: [PATCH] libvirt virt_type=parallels support enchancement As soon as Parallels Cloud Server/Virtuozzo is based on CloudLinux distribution this new rpm kind of distribution is introduced. Also we setup vnc and set vnc_encoding parameter to None as soon it isn't supported by parallels. Change-Id: Ib97a09f397f950227498cfc2ce162d19b700f6f4 --- functions-common | 6 ++++-- lib/nova_plugins/hypervisor-libvirt | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/functions-common b/functions-common index 061a9356f5..813d164272 100644 --- a/functions-common +++ b/functions-common @@ -269,8 +269,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` @@ -374,7 +375,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 f70b21a475..dfd8a67fd9 100644 --- a/lib/nova_plugins/hypervisor-libvirt +++ b/lib/nova_plugins/hypervisor-libvirt @@ -75,6 +75,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 }