From 24f6efadbdef558655abc5f1052bb61ae87b55f0 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Thu, 31 Oct 2013 10:27:58 -0400
Subject: [PATCH] Add FORCE_CONFIG_DRIVE and make it the default
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
---
lib/nova | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/lib/nova b/lib/nova
index e9fbd560b4..8ef5d9a427 100644
--- a/lib/nova
+++ b/lib/nova
@@ -63,6 +63,10 @@ NOVA_ROOTWRAP=$(get_rootwrap_location nova)
# NOTE: Set API_RATE_LIMIT="False" to turn OFF rate limiting
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``
# should work in most cases.
SCHEDULER=${SCHEDULER:-nova.scheduler.filter_scheduler.FilterScheduler}
@@ -428,6 +432,9 @@ function create_nova_conf() {
if [ "$API_RATE_LIMIT" != "True" ]; then
iniset $NOVA_CONF DEFAULT api_rate_limit "False"
fi
+ if [ "$FORCE_CONFIG_DRIVE" != "False" ]; then
+ iniset $NOVA_CONF DEFAULT force_config_drive "$FORCE_CONFIG_DRIVE"
+ fi
# Format logging
if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then
setup_colorized_logging $NOVA_CONF DEFAULT