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 /scripts/redstack | |
| parent | 5bff6f430010de957cb586d90810fcc507e1573d (diff) | |
| parent | 00697701f8120b7db91a2abce1930ece861b724c (diff) | |
| download | trove-integration-4cadf13b302fb97fbaed25c6f02f1e826d1b4e3c.tar.gz | |
Merge "Allow redstack to force kvm in devstack"
Diffstat (limited to 'scripts/redstack')
| -rwxr-xr-x | scripts/redstack | 2 |
1 files changed, 1 insertions, 1 deletions
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 |