openstack/devstack
Code Issues Proposed changes

Merge "Run n-cpu using LXD_GROUP when LXD virt driver"

Browse Source
This commit is contained in:
Jenkins 2016-09-26 15:01:26 +00:00 committed by Gerrit Code Review
commit de0b611032
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

@ -831,6 +831,8 @@ function start_nova_compute {
# ``sg`` is used in run_process to execute nova-compute as a member of the # ``sg`` is used in run_process to execute nova-compute as a member of the
# **$LIBVIRT_GROUP** group. # **$LIBVIRT_GROUP** group.
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
run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $LXD_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

@ -586,6 +586,9 @@ case "$VIRT_DRIVER" in
LIBVIRT_GROUP=libvirtd LIBVIRT_GROUP=libvirtd
fi fi
;; ;;
lxd)
LXD_GROUP=${LXD_GROUP:-"lxd"}
;;
fake) fake)
NUMBER_FAKE_NOVA_COMPUTE=${NUMBER_FAKE_NOVA_COMPUTE:-1} NUMBER_FAKE_NOVA_COMPUTE=${NUMBER_FAKE_NOVA_COMPUTE:-1}
;; ;;