From da7b8091b9f62efaa79473e22ad7ea50736dded1 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Mon, 8 Oct 2012 18:12:14 -0500
Subject: [PATCH] Extract create_nova_conf() from init_nova()

Allows creating a new nova.conf without wiping the database,
say, during an upgrade.

Change-Id: I7703b54bc3a32485b3cdab8d6185f93a6675040d
---
 lib/nova | 8 ++++++--
 stack.sh | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/nova b/lib/nova
index 333695ea3e..378b1db203 100644
--- a/lib/nova
+++ b/lib/nova
@@ -12,6 +12,7 @@
 #
 # install_nova
 # configure_nova
+# create_nova_conf
 # init_nova
 # start_nova
 # stop_nova
@@ -274,8 +275,8 @@ EOF'
     fi
 }
 
-# init_nova() - Initialize databases, etc.
-function init_nova() {
+# create_nova_conf() - Create a new nova.conf file
+function create_nova_conf() {
     # Remove legacy ``nova.conf``
     rm -f $NOVA_DIR/bin/nova.conf
 
@@ -352,7 +353,10 @@ function init_nova() {
         # Attempt to convert flags to options
         add_nova_opt ${I//--}
     done
+}
 
+# init_nova() - Initialize databases, etc.
+function init_nova() {
     # Nova Database
     # -------------
 
diff --git a/stack.sh b/stack.sh
index 118c2ef885..35da93548a 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1728,6 +1728,8 @@ fi
 
 if is_service_enabled nova; then
     echo_summary "Configuring Nova"
+    # Rebuild the config file from scratch
+    create_nova_conf
     init_nova
 fi