Merge "Remove API_RATE_LIMIT variable since it's wrong anyway"
This commit is contained in:
commit
37b5481f3d
7
lib/nova
7
lib/nova
@ -59,10 +59,6 @@ fi
|
|||||||
# Set the paths of certain binaries
|
# Set the paths of certain binaries
|
||||||
NOVA_ROOTWRAP=$(get_rootwrap_location nova)
|
NOVA_ROOTWRAP=$(get_rootwrap_location nova)
|
||||||
|
|
||||||
# Allow rate limiting to be turned off for testing, like for Tempest
|
|
||||||
# NOTE: Set API_RATE_LIMIT="False" to turn OFF rate limiting
|
|
||||||
API_RATE_LIMIT=${API_RATE_LIMIT:-"True"}
|
|
||||||
|
|
||||||
# Option to enable/disable config drive
|
# Option to enable/disable config drive
|
||||||
# NOTE: Set FORCE_CONFIG_DRIVE="False" to turn OFF config drive
|
# NOTE: Set FORCE_CONFIG_DRIVE="False" to turn OFF config drive
|
||||||
FORCE_CONFIG_DRIVE=${FORCE_CONFIG_DRIVE:-"always"}
|
FORCE_CONFIG_DRIVE=${FORCE_CONFIG_DRIVE:-"always"}
|
||||||
@ -461,9 +457,6 @@ function create_nova_conf {
|
|||||||
if [ "$SYSLOG" != "False" ]; then
|
if [ "$SYSLOG" != "False" ]; then
|
||||||
iniset $NOVA_CONF DEFAULT use_syslog "True"
|
iniset $NOVA_CONF DEFAULT use_syslog "True"
|
||||||
fi
|
fi
|
||||||
if [ "$API_RATE_LIMIT" != "True" ]; then
|
|
||||||
iniset $NOVA_CONF DEFAULT api_rate_limit "False"
|
|
||||||
fi
|
|
||||||
if [ "$FORCE_CONFIG_DRIVE" != "False" ]; then
|
if [ "$FORCE_CONFIG_DRIVE" != "False" ]; then
|
||||||
iniset $NOVA_CONF DEFAULT force_config_drive "$FORCE_CONFIG_DRIVE"
|
iniset $NOVA_CONF DEFAULT force_config_drive "$FORCE_CONFIG_DRIVE"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user