* fixes bug 959518
Change-Id: Ifc469a2e1cd90737420c17af513d9c39fb57ffb5
| ... | ... |
@@ -883,8 +883,8 @@ if is_service_enabled n-api; then |
| 883 | 883 |
# for Nova to validate Keystone tokens. |
| 884 | 884 |
|
| 885 | 885 |
# Allow rate limiting to be turned off for testing, like for Tempest |
| 886 |
- # NOTE: Set OSAPI_RATE_LIMIT=" " to turn OFF rate limiting |
|
| 887 |
- OSAPI_RATE_LIMIT=${OSAPI_RATE_LIMIT:-"ratelimit"}
|
|
| 886 |
+ # NOTE: Set API_RATE_LIMIT="False" to turn OFF rate limiting |
|
| 887 |
+ API_RATE_LIMIT=${API_RATE_LIMIT:-"True"}
|
|
| 888 | 888 |
|
| 889 | 889 |
# Remove legacy paste config if present |
| 890 | 890 |
rm -f $NOVA_DIR/bin/nova-api-paste.ini |
| ... | ... |
@@ -1320,10 +1320,14 @@ fi |
| 1320 | 1320 |
if [ "$SYSLOG" != "False" ]; then |
| 1321 | 1321 |
add_nova_opt "use_syslog=True" |
| 1322 | 1322 |
fi |
| 1323 |
+if [ "$API_RATE_LIMIT" != "True" ]; then |
|
| 1324 |
+ add_nova_opt "api_rate_limit=False" |
|
| 1325 |
+fi |
|
| 1326 |
+ |
|
| 1323 | 1327 |
|
| 1324 | 1328 |
# Provide some transition from EXTRA_FLAGS to EXTRA_OPTS |
| 1325 | 1329 |
if [[ -z "$EXTRA_OPTS" && -n "$EXTRA_FLAGS" ]]; then |
| 1326 |
- EXTRA_OPTS=$EXTRA_FLAGS |
|
| 1330 |
+ EXTRA_OPTS=$EXTRA_FLAGS |
|
| 1327 | 1331 |
fi |
| 1328 | 1332 |
|
| 1329 | 1333 |
# You can define extra nova conf flags by defining the array EXTRA_OPTS, |