Browse code

Remove legacy paste config and nova.conf

* Fixes bug 939907

Change-Id: Icef50b51bca86f78214f68f027283f2fa00807e1

Vishvananda Ishaya authored on 2012/02/24 08:35:43
Showing 1 changed files
... ...
@@ -817,6 +817,9 @@ if is_service_enabled n-api; then
817 817
     # one from the keystone project to launch nova.  This paste config adds
818 818
     # the configuration required for nova to validate keystone tokens.
819 819
 
820
+    # Remove legacy paste config
821
+    rm -f $NOVA_DIR/bin/nova-api-paste.ini
822
+
820 823
     # First we add a some extra data to the default paste config from nova
821 824
     cp $NOVA_DIR/etc/nova/api-paste.ini $NOVA_CONF
822 825
 
... ...
@@ -1115,6 +1118,9 @@ function add_nova_flag {
1115 1115
     echo "$1" >> $NOVA_CONF/nova.conf
1116 1116
 }
1117 1117
 
1118
+# remove legacy nova.conf
1119
+rm -f $NOVA_DIR/bin/nova.conf
1120
+
1118 1121
 # (re)create nova.conf
1119 1122
 rm -f $NOVA_CONF/nova.conf
1120 1123
 add_nova_flag "--verbose"