openstack
/
magnum
Code Issues Proposed changes

Merge "Use 'virt_type=kvm' in devstack vm if supported" into stable/newton

This commit is contained in:
Jenkins 2017-05-25 07:44:24 +00:00 committed by Gerrit Code Review
parent 556e51add4 6a6f9c039f
commit 2daa902a8a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
magnum/tests/contrib/gate_hook.sh
View File

@ -27,6 +27,11 @@ if [ "${coe}${special}" != "k8s-ironic" ]; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin octavia https://github.com/openstack/octavia"
fi
if egrep --quiet '(vmx|svm)' /proc/cpuinfo; then
export DEVSTACK_GATE_LIBVIRT_TYPE=kvm
fi
if [ "$coe" = "mesos" ]; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=https://fedorapeople.org/groups/magnum/ubuntu-mesos-newton.qcow2"
elif [ "$coe" = "k8s-coreos" ]; then