Browse code

Merge "Add virt driver 'zun' to devstack"

Jenkins authored on 2017/01/05 23:30:33
Showing 2 changed files
... ...
@@ -823,7 +823,7 @@ function start_nova_compute {
823 823
         run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $LIBVIRT_GROUP
824 824
     elif [[ "$VIRT_DRIVER" = 'lxd' ]]; then
825 825
         run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $LXD_GROUP
826
-    elif [[ "$VIRT_DRIVER" = 'docker' ]]; then
826
+    elif [[ "$VIRT_DRIVER" = 'docker' || "$VIRT_DRIVER" = 'zun' ]]; then
827 827
         run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $DOCKER_GROUP
828 828
     elif [[ "$VIRT_DRIVER" = 'fake' ]]; then
829 829
         local i
... ...
@@ -573,7 +573,7 @@ case "$VIRT_DRIVER" in
573 573
     lxd)
574 574
         LXD_GROUP=${LXD_GROUP:-"lxd"}
575 575
         ;;
576
-    docker)
576
+    docker|zun)
577 577
         DOCKER_GROUP=${DOCKER_GROUP:-"docker"}
578 578
         ;;
579 579
     fake)