Merge "Move SYMLINK_DIR declaration to bootstrap-aio.sh"

This commit is contained in:
Jenkins 2015-03-30 01:20:15 +00:00 committed by Gerrit Code Review
commit 9095404402
2 changed files with 1 additions and 1 deletions

View File

@ -29,6 +29,7 @@ export NOVA_VIRT_TYPE=${NOVA_VIRT_TYPE:-"qemu"}
export TEMPEST_FLAT_CIDR=${TEMPEST_FLAT_CIDR:-"172.29.248.0/22"}
export FLUSH_IPTABLES=${FLUSH_IPTABLES:-"yes"}
export RABBITMQ_PACKAGE_URL=${RABBITMQ_PACKAGE_URL:-""}
export SYMLINK_DIR=${SYMLINK_DIR:-"$(pwd)/logs"}
# Default disabled fatal deprecation warnings
export CINDER_FATAL_DEPRECATIONS=${CINDER_FATAL_DEPRECATIONS:-"no"}

View File

@ -36,7 +36,6 @@ export DEPLOY_TEMPEST=${DEPLOY_TEMPEST:-"yes"}
export MAX_RETRIES=${MAX_RETRIES:-"1"}
# limit forks for gate check
export FORKS=${FORKS:-10}
export SYMLINK_DIR=${SYMLINK_DIR:-"$(pwd)/logs"}
# tempest and testr options, default is to run tempest in serial
export RUN_TEMPEST_OPTS=${RUN_TEMPEST_OPTS:-'--serial'}
export TESTR_OPTS=${TESTR_OPTS:-''}