From 7a103dda1c7c40529d5eee4a2fdc9bf9aae883c9 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Thu, 23 Feb 2012 23:35:43 +0000
Subject: [PATCH] Remove legacy paste config and nova.conf

 * Fixes bug 939907

Change-Id: Icef50b51bca86f78214f68f027283f2fa00807e1
---
 stack.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/stack.sh b/stack.sh
index 6789778ff0..4e094cd042 100755
--- a/stack.sh
+++ b/stack.sh
@@ -817,6 +817,9 @@ if is_service_enabled n-api; then
     # one from the keystone project to launch nova.  This paste config adds
     # the configuration required for nova to validate keystone tokens.
 
+    # Remove legacy paste config
+    rm -f $NOVA_DIR/bin/nova-api-paste.ini
+
     # First we add a some extra data to the default paste config from nova
     cp $NOVA_DIR/etc/nova/api-paste.ini $NOVA_CONF
 
@@ -1115,6 +1118,9 @@ function add_nova_flag {
     echo "$1" >> $NOVA_CONF/nova.conf
 }
 
+# remove legacy nova.conf
+rm -f $NOVA_DIR/bin/nova.conf
+
 # (re)create nova.conf
 rm -f $NOVA_CONF/nova.conf
 add_nova_flag "--verbose"