Browse code

Merge "Remove API_RATE_LIMIT variable since it's wrong anyway"

Jenkins authored on 2014/08/23 16:39:33
Showing 1 changed files
... ...
@@ -59,10 +59,6 @@ fi
59 59
 # Set the paths of certain binaries
60 60
 NOVA_ROOTWRAP=$(get_rootwrap_location nova)
61 61
 
62
-# Allow rate limiting to be turned off for testing, like for Tempest
63
-# NOTE: Set API_RATE_LIMIT="False" to turn OFF rate limiting
64
-API_RATE_LIMIT=${API_RATE_LIMIT:-"True"}
65
-
66 62
 # Option to enable/disable config drive
67 63
 # NOTE: Set FORCE_CONFIG_DRIVE="False" to turn OFF config drive
68 64
 FORCE_CONFIG_DRIVE=${FORCE_CONFIG_DRIVE:-"always"}
... ...
@@ -461,9 +457,6 @@ function create_nova_conf {
461 461
     if [ "$SYSLOG" != "False" ]; then
462 462
         iniset $NOVA_CONF DEFAULT use_syslog "True"
463 463
     fi
464
-    if [ "$API_RATE_LIMIT" != "True" ]; then
465
-        iniset $NOVA_CONF DEFAULT api_rate_limit "False"
466
-    fi
467 464
     if [ "$FORCE_CONFIG_DRIVE" != "False" ]; then
468 465
         iniset $NOVA_CONF DEFAULT force_config_drive "$FORCE_CONFIG_DRIVE"
469 466
     fi