Browse code

Merge "libvirt virt_type=parallels support enchancement"

Jenkins authored on 2015/07/21 13:58:31
Showing 2 changed files
... ...
@@ -270,8 +270,9 @@ function GetOSVersion {
270 270
         # Fedora release 16 (Verne)
271 271
         # XenServer release 6.2.0-70446c (xenenterprise)
272 272
         # Oracle Linux release 7
273
+        # CloudLinux release 7.1
273 274
         os_CODENAME=""
274
-        for r in "Red Hat" CentOS Fedora XenServer; do
275
+        for r in "Red Hat" CentOS Fedora XenServer CloudLinux; do
275 276
             os_VENDOR=$r
276 277
             if [[ -n "`grep \"$r\" /etc/redhat-release`" ]]; then
277 278
                 ver=`sed -e 's/^.* \([0-9].*\) (\(.*\)).*$/\1\|\2/' /etc/redhat-release`
... ...
@@ -375,7 +376,8 @@ function is_fedora {
375 375
     fi
376 376
 
377 377
     [ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \
378
-        [ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleLinux" ]
378
+        [ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleLinux" ] || \
379
+        [ "$os_VENDOR" = "CloudLinux" ]
379 380
 }
380 381
 
381 382
 
... ...
@@ -64,6 +64,10 @@ function configure_nova_hypervisor {
64 64
     if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then
65 65
         iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system"
66 66
         iniset $NOVA_CONF libvirt images_type "ploop"
67
+        iniset $NOVA_CONF DEFAULT force_raw_images  "False"
68
+        iniset $NOVA_CONF DEFAULT vncserver_proxyclient_address  $HOST_IP
69
+        iniset $NOVA_CONF DEFAULT vncserver_listen $HOST_IP
70
+        iniset $NOVA_CONF DEFAULT vnc_keymap
67 71
     fi
68 72
 }
69 73