From c6712a9a1259e8dd95be3b6226a3ecd007825c2f Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Tue, 8 Sep 2015 15:19:18 +0200 Subject: [PATCH] Remove Zaqar vars from devstack-gate Zaqar's devstack code is now a plugin in Zaqar's codebase. The variables defined here are not needed anymore. Change-Id: I1ba10b18560f35f48a7258eaa2a57727617760bd --- devstack-vm-gate-wrap.sh | 8 -------- devstack-vm-gate.sh | 1 - 2 files changed, 9 deletions(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index 027c0e7d..52f891ef 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -218,11 +218,6 @@ export DEVSTACK_GATE_SAHARA=${DEVSTACK_GATE_SAHARA:-0} # Set to 1 to run trove export DEVSTACK_GATE_TROVE=${DEVSTACK_GATE_TROVE:-0} -# Set to 1 to run marconi/zaqar -# TODO remove marconi when safe to do so -export DEVSTACK_GATE_MARCONI=${DEVSTACK_GATE_MARCONI:-0} -export DEVSTACK_GATE_ZAQAR=${DEVSTACK_GATE_ZAQAR:-0} - # Set to 0 to disable config_drive and use the metadata server instead export DEVSTACK_GATE_CONFIGDRIVE=${DEVSTACK_GATE_CONFIGDRIVE:-1} @@ -366,9 +361,6 @@ 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} - # The topology of the system determinates the service distribution # among the nodes. # aio: `all in one` just only one node used diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 3ad74e42..bf467e6b 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -180,7 +180,6 @@ 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 DATABASE_QUERY_LOGGING=True EOF