Merge "Disable swift3 by default."
diff --git a/stack.sh b/stack.sh
index 1e10b10..753bb9d 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1740,6 +1740,7 @@
fi
add_nova_opt "sql_connection=$BASE_SQL_CONN/nova?charset=utf8"
add_nova_opt "libvirt_type=$LIBVIRT_TYPE"
+add_nova_opt "libvirt_cpu_mode=none"
add_nova_opt "instance_name_template=${INSTANCE_NAME_PREFIX}%08x"
# All nova-compute workers need to know the vnc configuration options
# These settings don't hurt anything if n-xvnc and n-novnc are disabled