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
... | ... |
@@ -269,8 +269,9 @@ function GetOSVersion { |
269 | 269 |
# Fedora release 16 (Verne) |
270 | 270 |
# XenServer release 6.2.0-70446c (xenenterprise) |
271 | 271 |
# Oracle Linux release 7 |
272 |
+ # CloudLinux release 7.1 |
|
272 | 273 |
os_CODENAME="" |
273 |
- for r in "Red Hat" CentOS Fedora XenServer; do |
|
274 |
+ for r in "Red Hat" CentOS Fedora XenServer CloudLinux; do |
|
274 | 275 |
os_VENDOR=$r |
275 | 276 |
if [[ -n "`grep \"$r\" /etc/redhat-release`" ]]; then |
276 | 277 |
ver=`sed -e 's/^.* \([0-9].*\) (\(.*\)).*$/\1\|\2/' /etc/redhat-release` |
... | ... |
@@ -374,7 +375,8 @@ function is_fedora { |
374 | 374 |
fi |
375 | 375 |
|
376 | 376 |
[ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \ |
377 |
- [ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleLinux" ] |
|
377 |
+ [ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleLinux" ] || \ |
|
378 |
+ [ "$os_VENDOR" = "CloudLinux" ] |
|
378 | 379 |
} |
379 | 380 |
|
380 | 381 |
|
... | ... |
@@ -75,6 +75,10 @@ function configure_nova_hypervisor { |
75 | 75 |
if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then |
76 | 76 |
iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system" |
77 | 77 |
iniset $NOVA_CONF libvirt images_type "ploop" |
78 |
+ iniset $NOVA_CONF DEFAULT force_raw_images "False" |
|
79 |
+ iniset $NOVA_CONF DEFAULT vncserver_proxyclient_address $HOST_IP |
|
80 |
+ iniset $NOVA_CONF DEFAULT vncserver_listen $HOST_IP |
|
81 |
+ iniset $NOVA_CONF DEFAULT vnc_keymap |
|
78 | 82 |
fi |
79 | 83 |
} |
80 | 84 |
|