openstack/devstack
Code Issues Proposed changes

Merge "Relocate SERVICE_TIMEOUT to stackrc"

Browse Source
This commit is contained in:
Jenkins 2014-10-04 20:52:21 +00:00 committed by Gerrit Code Review
commit bb67896cd9
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
stack.sh
View File

@ -501,9 +501,6 @@ SYSLOG_PORT=${SYSLOG_PORT:-516}
# Use color for logging output (only available if syslog is not used)
LOG_COLOR=`trueorfalse True $LOG_COLOR`
# Service startup timeout
SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60}
# Reset the bundle of CA certificates
SSL_BUNDLE_FILE="$DATA_DIR/ca-bundle.pem"
rm -f $SSL_BUNDLE_FILE

5
stackrc
View File

@ -580,6 +580,11 @@ SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
# Also sets the minimum number of workers to 2.
API_WORKERS=${API_WORKERS:=$(( ($(nproc)/2)<2 ? 2 : ($(nproc)/2) ))}
# Service startup timeout
SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60}
# Following entries need to be last items in file
# Local variables:
# mode: shell-script
# End: