openstack/octavia
Code Issues Proposed changes

Disable kvm on OVH infra instances

Browse Source 
OVH infra hosts are causing "KVM: entry failed, hardware error 0x0"
failures where instances fail to start (cirros, etc.).
This patch excludes OVH instances from kvm enablement until the issue is
resolved.
This patch also fixes an issue with a unit test failing after
cryptography 2.1 was released.

Co-Authored-By: Adam Harwell <flux.adam@gmail.com>

Change-Id: I630f513092c61d9785efe49d42aa3cfdc05a927e
This commit is contained in:
Michael Johnson
2017-10-27 15:44:19 -07:00
parent 6d29b8258f
commit 926fb27fbe
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,11 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT+=,diskimage-builder"$'\n'
# Sort out our gate args
. $(dirname "$0")/decode_args.sh
if egrep --quiet '(vmx|svm)' /proc/cpuinfo; then
# Note: The check for OVH 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
export DEVSTACK_GATE_LIBVIRT_TYPE=kvm
fi

8
octavia/tests/unit/common/tls_utils/test_cert_parser.py
View File

@@ -29,10 +29,10 @@ class TestTLSParseUtils(base.TestCase):
def test_alt_subject_name_parses(self):
hosts = cert_parser.get_host_names(sample_certs.ALT_EXT_CRT)
self.assertIn('www.cnfromsubject.org', hosts['cn'])
self.assertIn('www.hostfromdnsname1.com', hosts['dns_names'])
self.assertIn('www.hostfromdnsname2.com', hosts['dns_names'])
self.assertIn('www.hostfromdnsname3.com', hosts['dns_names'])
self.assertIn('www.hostfromdnsname4.com', hosts['dns_names'])
self.assertIn('www.hostFromDNSName1.com', hosts['dns_names'])
self.assertIn('www.hostFromDNSName2.com', hosts['dns_names'])
self.assertIn('www.hostFromDNSName3.com', hosts['dns_names'])
self.assertIn('www.hostFromDNSName4.com', hosts['dns_names'])
def test_x509_parses(self):
self.assertRaises(exceptions.UnreadableCert,