Merge "Use 'virt_type=kvm' in devstack vm if supported"
This commit is contained in:
commit
3a1f41f9f4
|
@ -33,6 +33,11 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-notifier"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector"
|
||||||
|
|
||||||
|
if egrep --quiet '(vmx|svm)' /proc/cpuinfo; then
|
||||||
|
export DEVSTACK_GATE_LIBVIRT_TYPE=kvm
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [ "$coe" = "mesos" ]; then
|
if [ "$coe" = "mesos" ]; then
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=https://fedorapeople.org/groups/magnum/ubuntu-mesos-ocata.qcow2"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=https://fedorapeople.org/groups/magnum/ubuntu-mesos-ocata.qcow2"
|
||||||
elif [ "$coe" = "k8s-coreos" ]; then
|
elif [ "$coe" = "k8s-coreos" ]; then
|
||||||
|
|
Loading…
Reference in New Issue