Browse code

Merge "Allow running nova compute with docker group"

Jenkins authored on 2016/11/20 19:39:25
Showing 2 changed files
... ...
@@ -827,6 +827,8 @@ function start_nova_compute {
827 827
         run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $LIBVIRT_GROUP
828 828
     elif [[ "$VIRT_DRIVER" = 'lxd' ]]; then
829 829
         run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $LXD_GROUP
830
+    elif [[ "$VIRT_DRIVER" = 'docker' ]]; then
831
+        run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $DOCKER_GROUP
830 832
     elif [[ "$VIRT_DRIVER" = 'fake' ]]; then
831 833
         local i
832 834
         for i in `seq 1 $NUMBER_FAKE_NOVA_COMPUTE`; do
... ...
@@ -589,6 +589,9 @@ case "$VIRT_DRIVER" in
589 589
     lxd)
590 590
         LXD_GROUP=${LXD_GROUP:-"lxd"}
591 591
         ;;
592
+    docker)
593
+        DOCKER_GROUP=${DOCKER_GROUP:-"docker"}
594
+        ;;
592 595
     fake)
593 596
         NUMBER_FAKE_NOVA_COMPUTE=${NUMBER_FAKE_NOVA_COMPUTE:-1}
594 597
         ;;