Browse code

Allow running nova compute with docker group

A use case is from Zun project that needs to start n-cpu with
"docker" group.

Change-Id: Ib8f193ea1edf1f148e9ba505205495170ebf6d67

Hongbin Lu authored on 2016/10/10 01:31:15
Showing 2 changed files
... ...
@@ -829,6 +829,8 @@ function start_nova_compute {
829 829
         run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $LIBVIRT_GROUP
830 830
     elif [[ "$VIRT_DRIVER" = 'lxd' ]]; then
831 831
         run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $LXD_GROUP
832
+    elif [[ "$VIRT_DRIVER" = 'docker' ]]; then
833
+        run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $DOCKER_GROUP
832 834
     elif [[ "$VIRT_DRIVER" = 'fake' ]]; then
833 835
         local i
834 836
         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
         ;;