From c9d69d8b21159fd2e83c0b9e6c0fc3242f3f8be2 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Tue, 14 Oct 2014 11:45:55 +0200 Subject: [PATCH] Set ZAQAR_BACKEND in localrc if present In order to add more gates on different backends for Zaqar, we need to set the ZAQAR_BACKEND env var in devstack. Setting it in the job is not enough since we need to teach devstack-gate.sh what to do with it. This patch does exactly that. The ZAQAR_BACKEND variable will be appended to localrc if it's been set. Change-Id: Ie629d6233798bd44663dfddb3ec02e3cdc1a69fe --- devstack-vm-gate-wrap.sh | 3 +++ devstack-vm-gate.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index 89e470a9..b8c3f4cd 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -316,6 +316,9 @@ export OVERRIDE_ZUUL_BRANCH=${OVERRIDE_ZUUL_BRANCH:-$ZUUL_BRANCH} # postgresql, mongodb. export DEVSTACK_GATE_CEILOMETER_BACKEND=${DEVSTACK_GATE_CEILOMETER_BACKEND:-mysql} +# Set Zaqar backend to override the default one. It could be mongodb, redis. +export DEVSTACK_GATE_ZAQAR_BACKEND=${DEVSTACK_GATE_ZAQAR_BACKEND:-mongodb} + if ! function_exists "gate_hook"; then # the command we use to run the gate function gate_hook { diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index f22d6882..92f14d72 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -113,6 +113,7 @@ CINDER_PERIODIC_INTERVAL=10 export OS_NO_CACHE=True CEILOMETER_BACKEND=$DEVSTACK_GATE_CEILOMETER_BACKEND LIBS_FROM_GIT=$DEVSTACK_PROJECT_FROM_GIT +ZAQAR_BACKEND=$DEVSTACK_GATE_ZAQAR_BACKEND EOF if [[ "$DEVSTACK_CINDER_SECURE_DELETE" -eq "0" ]]; then