From 00697701f8120b7db91a2abce1930ece861b724c Mon Sep 17 00:00:00 2001 From: Craig Vyvial Date: Thu, 21 Jan 2016 17:00:13 -0600 Subject: Allow redstack to force kvm in devstack Force kvm is useful if you have an environment where you can use kvm as the virtualization for nested instances. Change-Id: I89ac30243e3c47cbd36b0a0890242a2a8031bea4 --- scripts/local.conf.d/use_kvm.rc | 4 ++++ scripts/redstack | 2 +- scripts/redstack.rc | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 scripts/local.conf.d/use_kvm.rc 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 6161d50..97a17b3 100755 --- a/scripts/redstack +++ b/scripts/redstack @@ -1097,7 +1097,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 4d5c024..5ccce26 100644 --- a/scripts/redstack.rc +++ b/scripts/redstack.rc @@ -23,6 +23,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 -- cgit v1.2.1