Merge "Remove Zaqar vars from devstack-gate"

This commit is contained in:
Jenkins
2015-09-21 18:21:13 +00:00
committed by Gerrit Code Review
2 changed files with 0 additions and 9 deletions

View File

@@ -205,11 +205,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}
@@ -361,9 +356,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

View File

@@ -275,7 +275,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