Browse code

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

Jenkins authored on 2013/02/14 11:11:47
Showing 1 changed files
... ...
@@ -1059,9 +1059,7 @@ if is_service_enabled nova; then
1059 1059
 
1060 1060
     elif [ "$VIRT_DRIVER" = 'openvz' ]; then
1061 1061
         echo_summary "Using OpenVZ virtualization driver"
1062
-        # TODO(deva): OpenVZ driver does not yet work if compute_driver is set here.
1063
-        #             Replace connection_type when this is fixed.
1064
-        #             iniset $NOVA_CONF DEFAULT compute_driver "openvz.connection.OpenVzConnection"
1062
+        iniset $NOVA_CONF DEFAULT compute_driver "openvz.driver.OpenVzDriver"
1065 1063
         iniset $NOVA_CONF DEFAULT connection_type "openvz"
1066 1064
         LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
1067 1065
         iniset $NOVA_CONF DEFAULT firewall_driver "$LIBVIRT_FIREWALL_DRIVER"