Skip to content

Commit 53a49d1

Browse files
author
Hongbin Lu
committed
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
1 parent 2a7e909 commit 53a49d1

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

lib/nova

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ function start_nova_compute {
823823
run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $LIBVIRT_GROUP
824824
elif [[ "$VIRT_DRIVER" = 'lxd' ]]; then
825825
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
827827
run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $DOCKER_GROUP
828828
elif [[ "$VIRT_DRIVER" = 'fake' ]]; then
829829
local i

stackrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ case "$VIRT_DRIVER" in
573573
lxd)
574574
LXD_GROUP=${LXD_GROUP:-"lxd"}
575575
;;
576-
docker)
576+
docker|zun)
577577
DOCKER_GROUP=${DOCKER_GROUP:-"docker"}
578578
;;
579579
fake)

0 commit comments

Comments
 (0)