commit 160eb23346b683b8610370724e714ef3c06fd987
author Zuul <zuul@review.openstack.org> Sat Sep 08 03:29:24 2018 +0000
committer Gerrit Code Review <review@openstack.org> Sat Sep 08 03:29:24 2018 +0000
tree bcd4fddc2f56efd210c99ab989bd020b752ad786
parent dfd818a421886cc65ff54531df42f11c0cc294c0
parent cafb606023b0c1df02272046faf76edf94793642

Merge "Disable KVM at limestone (again)"

playbooks/Octavia-DSVM/pre.yaml

diff --git a/playbooks/Octavia-DSVM/pre.yaml b/playbooks/Octavia-DSVM/pre.yaml
index 3ab7e20..9d6beb7 100644
--- a/playbooks/Octavia-DSVM/pre.yaml
+++ b/playbooks/Octavia-DSVM/pre.yaml
@@ -6,7 +6,7 @@
         cmd: |
           set -e
           set -x
-          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