openstack/devstack
Code Issues Proposed changes

Merge "Fixes openvz driver support for nova when deployed with devstack."

Browse Source
This commit is contained in:
Jenkins 2013-02-14 02:11:47 +00:00 committed by Gerrit Code Review
commit 3143ac5734
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stack.sh
View File

@ -1059,9 +1059,7 @@ if is_service_enabled nova; then
elif [ "$VIRT_DRIVER" = 'openvz' ]; then elif [ "$VIRT_DRIVER" = 'openvz' ]; then
echo_summary "Using OpenVZ virtualization driver" echo_summary "Using OpenVZ virtualization driver"
# TODO(deva): OpenVZ driver does not yet work if compute_driver is set here. iniset $NOVA_CONF DEFAULT compute_driver "openvz.driver.OpenVzDriver"
# Replace connection_type when this is fixed.
# iniset $NOVA_CONF DEFAULT compute_driver "openvz.connection.OpenVzConnection"
iniset $NOVA_CONF DEFAULT connection_type "openvz" iniset $NOVA_CONF DEFAULT connection_type "openvz"
LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"} LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
iniset $NOVA_CONF DEFAULT firewall_driver "$LIBVIRT_FIREWALL_DRIVER" iniset $NOVA_CONF DEFAULT firewall_driver "$LIBVIRT_FIREWALL_DRIVER"