openstack
/
trove-integration
Code Issues Proposed changes

Merge "Allow redstack to force kvm in devstack"

This commit is contained in:
Jenkins 2016-04-04 10:51:47 +00:00 committed by Gerrit Code Review
parent 5bff6f4300 00697701f8
commit 4cadf13b30
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/local.conf.d/use_kvm.rc Normal file
View File

@ -0,0 +1,4 @@
[[local|localrc]]
# force kvm as the libvirt type.
LIBVIRT_TYPE=kvm

2
scripts/redstack
View File

@ -1128,7 +1128,7 @@ function cmd_dsvm_gate_tests() {
NETWORK_GATEWAY=${5:-'10.1.0.1'}
ESCAPED_PATH_TROVE=${6:-'\/opt\/stack\/new\/trove'}
if [[ $BRANCH_OVERRIDE == "stable/liberty" || $BRANCH_OVERRIDE == "stable/liberty" ]]; then
if [[ $BRANCH_OVERRIDE == "stable/liberty" ]]; then
# Devstack in liberty doesn't copy the clouds.yaml file to /etc so we need to
# ensure we have access to the clouds.yaml file set up by devstack-gate
sudo mkdir -p ~/.config/openstack

1
scripts/redstack.rc
View File

@ -27,6 +27,7 @@ LIBS_FROM_GIT_ALL_OSLO=$(get_bool LIBS_FROM_GIT_ALL_OSLO false)
# Don't include certain .rc files in local.conf.d by default
USING_VAGRANT=$(get_bool USING_VAGRANT false)
USE_KVM=$(get_bool USE_KVM false)
USE_UUID_TOKEN=$(get_bool USE_UUID_TOKEN false)
# Specify configuration for Ceilometer