diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-04 10:51:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-04 10:51:47 +0000 |
| commit | 4cadf13b302fb97fbaed25c6f02f1e826d1b4e3c (patch) | |
| tree | 897ab0965ea95320ea20fd11d021b729003ed1cb | |
| parent | 5bff6f430010de957cb586d90810fcc507e1573d (diff) | |
| parent | 00697701f8120b7db91a2abce1930ece861b724c (diff) | |
| download | trove-integration-4cadf13b302fb97fbaed25c6f02f1e826d1b4e3c.tar.gz | |
Merge "Allow redstack to force kvm in devstack"
| -rw-r--r-- | scripts/local.conf.d/use_kvm.rc | 4 | ||||
| -rwxr-xr-x | scripts/redstack | 2 | ||||
| -rw-r--r-- | scripts/redstack.rc | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/scripts/local.conf.d/use_kvm.rc b/scripts/local.conf.d/use_kvm.rc new file mode 100644 index 0000000..06bc2eb --- /dev/null +++ b/scripts/local.conf.d/use_kvm.rc @@ -0,0 +1,4 @@ +[[local|localrc]] + +# force kvm as the libvirt type. +LIBVIRT_TYPE=kvm diff --git a/scripts/redstack b/scripts/redstack index 7213cc4..af8fb35 100755 --- a/scripts/redstack +++ b/scripts/redstack @@ -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 diff --git a/scripts/redstack.rc b/scripts/redstack.rc index e3813be..9681f97 100644 --- a/scripts/redstack.rc +++ b/scripts/redstack.rc @@ -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 |