openstack/devstack
Code Issues Proposed changes

Merge "Allow running nova compute with docker group"

Browse Source
This commit is contained in:
Jenkins 2016-11-20 10:39:25 +00:00 committed by Gerrit Code Review
commit ab797201e8
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nova
View File

@ -827,6 +827,8 @@ function start_nova_compute {
run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $LIBVIRT_GROUP run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $LIBVIRT_GROUP
elif [[ "$VIRT_DRIVER" = 'lxd' ]]; then elif [[ "$VIRT_DRIVER" = 'lxd' ]]; then
run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $LXD_GROUP 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 elif [[ "$VIRT_DRIVER" = 'fake' ]]; then
local i local i
for i in `seq 1 $NUMBER_FAKE_NOVA_COMPUTE`; do for i in `seq 1 $NUMBER_FAKE_NOVA_COMPUTE`; do

3
stackrc
View File

@ -589,6 +589,9 @@ case "$VIRT_DRIVER" in
lxd) lxd)
LXD_GROUP=${LXD_GROUP:-"lxd"} LXD_GROUP=${LXD_GROUP:-"lxd"}
;; ;;
docker)
DOCKER_GROUP=${DOCKER_GROUP:-"docker"}
;;
fake) fake)
NUMBER_FAKE_NOVA_COMPUTE=${NUMBER_FAKE_NOVA_COMPUTE:-1} NUMBER_FAKE_NOVA_COMPUTE=${NUMBER_FAKE_NOVA_COMPUTE:-1}
;; ;;