commit ab797201e80dbb2ac651e8341510c4f1e32924d0
author Jenkins <jenkins@review.openstack.org> Sun Nov 20 10:39:25 2016 +0000
committer Gerrit Code Review <review@openstack.org> Sun Nov 20 10:39:25 2016 +0000
tree 03d6513e54de35f7925456a2d4ca7e762fe602c8
parent 2f99e882cef75c4c3fb166ad823e15dfda844d87
parent bc5cfc05842a4d4514082a2431020c5b881e52a1

Merge "Allow running nova compute with docker group"

lib/nova

diff --git a/lib/nova b/lib/nova
index f38fb8b..ca9a6c7 100644
--- a/lib/nova
+++ b/lib/nova
@@ -827,6 +827,8 @@
         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
+        run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $DOCKER_GROUP
     elif [[ "$VIRT_DRIVER" = 'fake' ]]; then
         local i
         for i in `seq 1 $NUMBER_FAKE_NOVA_COMPUTE`; do

stackrc

diff --git a/stackrc b/stackrc
index 8210eb9..31f0759 100644
--- a/stackrc
+++ b/stackrc
@@ -589,6 +589,9 @@
     lxd)
         LXD_GROUP=${LXD_GROUP:-"lxd"}
         ;;
+    docker)
+        DOCKER_GROUP=${DOCKER_GROUP:-"docker"}
+        ;;
     fake)
         NUMBER_FAKE_NOVA_COMPUTE=${NUMBER_FAKE_NOVA_COMPUTE:-1}
         ;;