Adds a new FORCE_CONFIG_DRIVE option to lib/nova which
is by default enabled. Using config drive should speed
things up a bit and is a more likely production default
instead of file injection.
Change-Id: I2388ef0df12a6289b619bfaf30cb952fcc48ef41
... | ... |
@@ -63,6 +63,10 @@ NOVA_ROOTWRAP=$(get_rootwrap_location nova) |
63 | 63 |
# NOTE: Set API_RATE_LIMIT="False" to turn OFF rate limiting |
64 | 64 |
API_RATE_LIMIT=${API_RATE_LIMIT:-"True"} |
65 | 65 |
|
66 |
+# Option to enable/disable config drive |
|
67 |
+# NOTE: Set FORCE_CONFIG_DRIVE="False" to turn OFF config drive |
|
68 |
+FORCE_CONFIG_DRIVE=${FORCE_CONFIG_DRIVE:-"always"} |
|
69 |
+ |
|
66 | 70 |
# Nova supports pluggable schedulers. The default ``FilterScheduler`` |
67 | 71 |
# should work in most cases. |
68 | 72 |
SCHEDULER=${SCHEDULER:-nova.scheduler.filter_scheduler.FilterScheduler} |
... | ... |
@@ -428,6 +432,9 @@ function create_nova_conf() { |
428 | 428 |
if [ "$API_RATE_LIMIT" != "True" ]; then |
429 | 429 |
iniset $NOVA_CONF DEFAULT api_rate_limit "False" |
430 | 430 |
fi |
431 |
+ if [ "$FORCE_CONFIG_DRIVE" != "False" ]; then |
|
432 |
+ iniset $NOVA_CONF DEFAULT force_config_drive "$FORCE_CONFIG_DRIVE" |
|
433 |
+ fi |
|
431 | 434 |
# Format logging |
432 | 435 |
if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then |
433 | 436 |
setup_colorized_logging $NOVA_CONF DEFAULT |