openstack/devstack
Code Issues Proposed changes

Merge "Add FORCE_CONFIG_DRIVE and make it the default"

Browse Source
This commit is contained in:
Jenkins 2013-11-01 18:51:00 +00:00 committed by Gerrit Code Review
commit 385775d83f
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/nova
View File

@ -63,6 +63,10 @@ NOVA_ROOTWRAP=$(get_rootwrap_location nova)
# NOTE: Set API_RATE_LIMIT="False" to turn OFF rate limiting # NOTE: Set API_RATE_LIMIT="False" to turn OFF rate limiting
API_RATE_LIMIT=${API_RATE_LIMIT:-"True"} API_RATE_LIMIT=${API_RATE_LIMIT:-"True"}
# Option to enable/disable config drive
# NOTE: Set FORCE_CONFIG_DRIVE="False" to turn OFF config drive
FORCE_CONFIG_DRIVE=${FORCE_CONFIG_DRIVE:-"always"}
# Nova supports pluggable schedulers. The default ``FilterScheduler`` # Nova supports pluggable schedulers. The default ``FilterScheduler``
# should work in most cases. # should work in most cases.
SCHEDULER=${SCHEDULER:-nova.scheduler.filter_scheduler.FilterScheduler} SCHEDULER=${SCHEDULER:-nova.scheduler.filter_scheduler.FilterScheduler}
@ -428,6 +432,9 @@ function create_nova_conf() {
if [ "$API_RATE_LIMIT" != "True" ]; then if [ "$API_RATE_LIMIT" != "True" ]; then
iniset $NOVA_CONF DEFAULT api_rate_limit "False" iniset $NOVA_CONF DEFAULT api_rate_limit "False"
fi fi
if [ "$FORCE_CONFIG_DRIVE" != "False" ]; then
iniset $NOVA_CONF DEFAULT force_config_drive "$FORCE_CONFIG_DRIVE"
fi
# Format logging # Format logging
if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then
setup_colorized_logging $NOVA_CONF DEFAULT setup_colorized_logging $NOVA_CONF DEFAULT