Browse code

Disable vnc on Power Systems

Power systems don't have graphics adapters, so we can't simulate a VNC
console. This patch removes that from the default nova configuration
if the system architecture is ppc64.

Change-Id: I129d180b712115e5c275241740d34805fea23e8b

Daniel Jones authored on 2013/06/19 05:28:01
Showing 2 changed files
... ...
@@ -471,6 +471,13 @@ function exit_distro_not_supported {
471 471
     fi
472 472
 }
473 473
 
474
+# Utility function for checking machine architecture
475
+# is_arch arch-type
476
+function is_arch {
477
+    ARCH_TYPE=$1
478
+
479
+    [ "($uname -m)" = "$ARCH_TYPE" ]
480
+}
474 481
 
475 482
 # git clone only if directory doesn't exist already.  Since ``DEST`` might not
476 483
 # be owned by the installation user, we create the directory and change the
... ...
@@ -1108,6 +1108,10 @@ if is_service_enabled nova; then
1108 1108
         iniset $NOVA_CONF DEFAULT compute_driver "libvirt.LibvirtDriver"
1109 1109
         LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
1110 1110
         iniset $NOVA_CONF DEFAULT firewall_driver "$LIBVIRT_FIREWALL_DRIVER"
1111
+        # Power architecture currently does not support graphical consoles.
1112
+        if is_arch "ppc64"; then
1113
+            iniset $NOVA_CONF DEFAULT vnc_enabled "false"
1114
+        fi
1111 1115
     fi
1112 1116
 
1113 1117
     init_nova_cells