commit 53a49d104a59678ec36c5b8f4406ad51d69cf5f7
author Hongbin Lu <hongbin.lu@huawei.com> Fri Dec 23 16:16:50 2016 -0600
committer Hongbin Lu <hongbin.lu@huawei.com> Wed Jan 04 15:56:06 2017 -0600
tree 540729ca46ba0e754917032c0b61e7680ff13135
parent 2a7e909b3f9480d3a61bd9ec497a954c833d14c8

Add virt driver 'zun' to devstack

According to the feedback in the TC meeting [1], we renamed the Nova
virt driver from "docker" to "zun" [2] to avoid name collision
to nova-docker. This rename also help to clarify the difference
between these two drivers.

[1] http://eavesdrop.openstack.org/meetings/tc/2016/
    tc.2016-11-29-20.01.log.html
[2] https://review.openstack.org/#/c/414651/

Change-Id: I747080953ae4d1d35ed334831100413b6e4466c4

lib/nova

diff --git a/lib/nova b/lib/nova
index 50c0d47..8f11e0f 100644
--- a/lib/nova
+++ b/lib/nova
@@ -823,7 +823,7 @@
         run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $LIBVIRT_GROUP
     elif [[ "$VIRT_DRIVER" = 'lxd' ]]; then
         run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $LXD_GROUP
-    elif [[ "$VIRT_DRIVER" = 'docker' ]]; then
+    elif [[ "$VIRT_DRIVER" = 'docker' || "$VIRT_DRIVER" = 'zun' ]]; then
         run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $DOCKER_GROUP
     elif [[ "$VIRT_DRIVER" = 'fake' ]]; then
         local i