From fa868cb59c5847d1836d94977774bd3fafa87f27 Mon Sep 17 00:00:00 2001 From: Daniel Jones Date: Tue, 18 Jun 2013 15:28:01 -0500 Subject: [PATCH] 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 --- functions | 7 +++++++ stack.sh | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/functions b/functions index 8aba10da5a..c611e0046c 100644 --- a/functions +++ b/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 diff --git a/stack.sh b/stack.sh index 4089531710..f8d546fc1c 100755 --- a/stack.sh +++ b/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