Browse code

Merge "Extract create_nova_conf() from init_nova()"

Jenkins authored on 2012/10/25 06:17:45
Showing 2 changed files
... ...
@@ -12,6 +12,7 @@
12 12
 #
13 13
 # install_nova
14 14
 # configure_nova
15
+# create_nova_conf
15 16
 # init_nova
16 17
 # start_nova
17 18
 # stop_nova
... ...
@@ -274,8 +275,8 @@ EOF'
274 274
     fi
275 275
 }
276 276
 
277
-# init_nova() - Initialize databases, etc.
278
-function init_nova() {
277
+# create_nova_conf() - Create a new nova.conf file
278
+function create_nova_conf() {
279 279
     # Remove legacy ``nova.conf``
280 280
     rm -f $NOVA_DIR/bin/nova.conf
281 281
 
... ...
@@ -352,7 +353,10 @@ function init_nova() {
352 352
         # Attempt to convert flags to options
353 353
         add_nova_opt ${I//--}
354 354
     done
355
+}
355 356
 
357
+# init_nova() - Initialize databases, etc.
358
+function init_nova() {
356 359
     # Nova Database
357 360
     # -------------
358 361
 
... ...
@@ -1792,6 +1792,8 @@ fi
1792 1792
 
1793 1793
 if is_service_enabled nova; then
1794 1794
     echo_summary "Configuring Nova"
1795
+    # Rebuild the config file from scratch
1796
+    create_nova_conf
1795 1797
     init_nova
1796 1798
 fi
1797 1799