openstack/devstack
Code Issues Proposed changes

Relocate SERVICE_TIMEOUT to stackrc

Browse Source 
cinder_driver_cert.sh restarts volume services
and needs the SERVICE_TIMEOUT variable set, but
that was being declared in stack.sh.

Rather than create another duplicate variable in
the cert script, just move the SERVICE_TIMEOUT
variable to stackrc so it can be shared like other
common variables.

Change-Id: I650697df015fed8f400101a13b6165ac39626877
Closes-Bug: 1350221
This commit is contained in:
John Griffith 2014-09-19 10:26:51 -06:00
parent 12294d2b19
commit 44e16e01da
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

@ -325,9 +325,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

@ -516,6 +516,11 @@ SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
# (the default number of workers for many services is the number of CPUs)
# API_WORKERS=4
# Service startup timeout
SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60}
# Following entries need to be last items in file
# Local variables:
# mode: shell-script
# End: