openstack
/
octavia
Code Issues Proposed changes

Merge "Disable KVM at limestone (again)"

This commit is contained in:
Zuul 2018-09-08 03:29:23 +00:00 committed by Gerrit Code Review
parent e99d0d60f4 9d7c14295e
commit c7395e0488
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
octavia/tests/contrib/gate_hook.sh
View File

@ -25,11 +25,11 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT+=,diskimage-builder"$'\n'
# Sort out our gate args
. $(dirname "$0")/decode_args.sh
# Note: The check for OVH instances is temporary until they
# Note: The check for OVH and limestone instances is temporary until they
# resolve the KVM failures as logged here:
# https://bugzilla.kernel.org/show_bug.cgi?id=192521
# However, this may be resolved at OVH before the kernel bug is resolved.
if $(egrep --quiet '(vmx|svm)' /proc/cpuinfo) && [[ ! $(hostname) =~ "ovh" ]]; then
if $(egrep --quiet '(vmx|svm)' /proc/cpuinfo) && [[ ( ! $(hostname) =~ "ovh" && ! $(hostname) =~ "limestone" ) ]]; then
export DEVSTACK_GATE_LIBVIRT_TYPE=kvm
fi