Browse code

Merge "Run n-cpu using LXD_GROUP when LXD virt driver"

Jenkins authored on 2016/09/27 00:01:26
Showing 2 changed files
... ...
@@ -831,6 +831,8 @@ function start_nova_compute {
831 831
         # ``sg`` is used in run_process to execute nova-compute as a member of the
832 832
         # **$LIBVIRT_GROUP** group.
833 833
         run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $LIBVIRT_GROUP
834
+    elif [[ "$VIRT_DRIVER" = 'lxd' ]]; then
835
+        run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $LXD_GROUP
834 836
     elif [[ "$VIRT_DRIVER" = 'fake' ]]; then
835 837
         local i
836 838
         for i in `seq 1 $NUMBER_FAKE_NOVA_COMPUTE`; do
... ...
@@ -586,6 +586,9 @@ case "$VIRT_DRIVER" in
586 586
             LIBVIRT_GROUP=libvirtd
587 587
         fi
588 588
         ;;
589
+    lxd)
590
+        LXD_GROUP=${LXD_GROUP:-"lxd"}
591
+        ;;
589 592
     fake)
590 593
         NUMBER_FAKE_NOVA_COMPUTE=${NUMBER_FAKE_NOVA_COMPUTE:-1}
591 594
         ;;