Browse code
Relocate SERVICE_TIMEOUT to stackrc
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
John Griffith authored on 2014/09/20 01:26:51Showing 2 changed files
| ... | ... |
@@ -325,9 +325,6 @@ SYSLOG_PORT=${SYSLOG_PORT:-516}
|
| 325 | 325 |
# Use color for logging output (only available if syslog is not used) |
| 326 | 326 |
LOG_COLOR=`trueorfalse True $LOG_COLOR` |
| 327 | 327 |
|
| 328 |
-# Service startup timeout |
|
| 329 |
-SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60}
|
|
| 330 |
- |
|
| 331 | 328 |
# Reset the bundle of CA certificates |
| 332 | 329 |
SSL_BUNDLE_FILE="$DATA_DIR/ca-bundle.pem" |
| 333 | 330 |
rm -f $SSL_BUNDLE_FILE |
| ... | ... |
@@ -516,6 +516,11 @@ SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
|
| 516 | 516 |
# (the default number of workers for many services is the number of CPUs) |
| 517 | 517 |
# API_WORKERS=4 |
| 518 | 518 |
|
| 519 |
+# Service startup timeout |
|
| 520 |
+SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60}
|
|
| 521 |
+ |
|
| 522 |
+# Following entries need to be last items in file |
|
| 523 |
+ |
|
| 519 | 524 |
# Local variables: |
| 520 | 525 |
# mode: shell-script |
| 521 | 526 |
# End: |