Merge "Change redstack to use default config values"

This commit is contained in:
Jenkins 2016-05-03 23:52:31 +00:00 committed by Gerrit Code Review
commit ccc33811cf
1 changed files with 12 additions and 9 deletions

View File

@ -92,12 +92,15 @@ SWIFT_DISK_IMAGE=${SWIFT_DATA_DIR}/drives/images/swift.img
DISTRO=${DISTRO:-ubuntu}
#DISTRO=fedora
TROVE_AGENT_CALL_HIGH_TIMEOUT=${TROVE_AGENT_CALL_HIGH_TIMEOUT:-300}
TROVE_RESIZE_TIME_OUT=${TROVE_RESIZE_TIME_OUT:-900}
TROVE_USAGE_TIMEOUT=${TROVE_USAGE_TIMEOUT:-1500}
TROVE_STATE_CHANGE_WAIT_TIME=${TROVE_STATE_CHANGE_WAIT_TIME:-180}
# Set up quota values
TROVE_MAX_ACCEPTED_VOLUME_SIZE=${TROVE_MAX_ACCEPTED_VOLUME_SIZE:-10}
TROVE_MAX_INSTANCES_PER_USER=${TROVE_MAX_INSTANCES_PER_USER:-10}
TROVE_MAX_VOLUMES_PER_USER=${TROVE_MAX_VOLUMES_PER_USER:-10}
# The following values can be used to tweak how devstack sets
# up Trove. If not explicitly set, the defaults in the code are used.
# To make changes without modifying the repo, add these variables
# to options.rc or ~/redstack.options.rc
#export TROVE_MAX_ACCEPTED_VOLUME_SIZE=10
#export TROVE_MAX_INSTANCES_PER_TENANT=10
#export TROVE_MAX_VOLUMES_PER_TENANT=40
#export TROVE_AGENT_CALL_LOW_TIMEOUT=15
#export TROVE_AGENT_CALL_HIGH_TIMEOUT=300
#export TROVE_RESIZE_TIME_OUT=900
#export TROVE_USAGE_TIMEOUT=1500
#export TROVE_STATE_CHANGE_WAIT_TIME=180