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
diff --git a/functions-common b/functions-common
index 061a935..813d164 100644
--- a/functions-common
+++ b/functions-common
@@ -269,8 +269,9 @@
# 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 @@
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 f70b21a..dfd8a67 100644
--- a/lib/nova_plugins/hypervisor-libvirt
+++ b/lib/nova_plugins/hypervisor-libvirt
@@ -75,6 +75,10 @@
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
}