Browse code

Merge "Allow starting nova-compute manually"

Jenkins authored on 2013/10/22 22:53:50
Showing 1 changed files
... ...
@@ -611,20 +611,10 @@ function start_nova_api() {
611 611
     fi
612 612
 }
613 613
 
614
-# start_nova() - Start running processes, including screen
615
-function start_nova() {
614
+# start_nova_compute() - Start the compute process
615
+function start_nova_compute() {
616 616
     NOVA_CONF_BOTTOM=$NOVA_CONF
617 617
 
618
-    # ``screen_it`` checks ``is_service_enabled``, it is not needed here
619
-    screen_it n-cond "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-conductor"
620
-
621
-    if is_service_enabled n-cell; then
622
-        NOVA_CONF_BOTTOM=$NOVA_CELLS_CONF
623
-        screen_it n-cond "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-conductor --config-file $NOVA_CELLS_CONF"
624
-        screen_it n-cell-region "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-cells --config-file $NOVA_CONF"
625
-        screen_it n-cell-child "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-cells --config-file $NOVA_CELLS_CONF"
626
-    fi
627
-
628 618
     if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then
629 619
         # The group **$LIBVIRT_GROUP** is added to the current user in this script.
630 620
         # Use 'sg' to execute nova-compute as a member of the **$LIBVIRT_GROUP** group.
... ...
@@ -640,6 +630,22 @@ function start_nova() {
640 640
         fi
641 641
         screen_it n-cpu "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-compute --config-file $NOVA_CONF_BOTTOM"
642 642
     fi
643
+}
644
+
645
+# start_nova() - Start running processes, including screen
646
+function start_nova_rest() {
647
+    NOVA_CONF_BOTTOM=$NOVA_CONF
648
+
649
+    # ``screen_it`` checks ``is_service_enabled``, it is not needed here
650
+    screen_it n-cond "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-conductor"
651
+
652
+    if is_service_enabled n-cell; then
653
+        NOVA_CONF_BOTTOM=$NOVA_CELLS_CONF
654
+        screen_it n-cond "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-conductor --config-file $NOVA_CELLS_CONF"
655
+        screen_it n-cell-region "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-cells --config-file $NOVA_CONF"
656
+        screen_it n-cell-child "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-cells --config-file $NOVA_CELLS_CONF"
657
+    fi
658
+
643 659
     screen_it n-crt "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-cert"
644 660
     screen_it n-net "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-network --config-file $NOVA_CONF_BOTTOM"
645 661
     screen_it n-sch "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-scheduler --config-file $NOVA_CONF_BOTTOM"
... ...
@@ -656,6 +662,11 @@ function start_nova() {
656 656
         screen_it n-obj "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-objectstore"
657 657
 }
658 658
 
659
+function start_nova() {
660
+    start_nova_compute
661
+    start_nova_rest
662
+}
663
+
659 664
 # stop_nova() - Stop running processes (non-screen)
660 665
 function stop_nova() {
661 666
     # Kill the nova screen windows