Merge "Disable vnc on Power Systems"

functions

@@ -471,6 +471,13 @@ function exit_distro_not_supported {
     fi
 }
 
+# Utility function for checking machine architecture
+# is_arch arch-type
+function is_arch {
+    ARCH_TYPE=$1
+
+    [ "($uname -m)" = "$ARCH_TYPE" ]
+}
 
 # git clone only if directory doesn't exist already.  Since ``DEST`` might not
 # be owned by the installation user, we create the directory and change the

stack.sh

@@ -1108,6 +1108,10 @@ if is_service_enabled nova; then
         iniset $NOVA_CONF DEFAULT compute_driver "libvirt.LibvirtDriver"
         LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
         iniset $NOVA_CONF DEFAULT firewall_driver "$LIBVIRT_FIREWALL_DRIVER"
+        # Power architecture currently does not support graphical consoles.
+        if is_arch "ppc64"; then
+            iniset $NOVA_CONF DEFAULT vnc_enabled "false"
+        fi
     fi
 
     init_nova_cells