commit 1155ce97d57786d0d02ca4ad94480512405a0a82
author Jenkins <jenkins@review.openstack.org> Fri Mar 01 23:02:22 2013 +0000
committer Gerrit Code Review <review@openstack.org> Fri Mar 01 23:02:22 2013 +0000
tree 342cacc10fb6b786f40bc0442f1065d035be4cc1
parent b057f4f75c6d1021981a74beb49316bff097ec7b
parent 4a20f9a175fc4237ed16e535ab8250cc21cd0e8c

Merge "add quantum_available flag to tempest"

.gitignore

diff --git a/.gitignore b/.gitignore
index f9e2644..798b081 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 *.pem
 accrc
 .stackenv
+.prereqs

stack.sh

diff --git a/stack.sh b/stack.sh
index a4106e5..7dc0469 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1070,7 +1070,7 @@
 
     elif [ "$VIRT_DRIVER" = 'openvz' ]; then
         echo_summary "Using OpenVZ virtualization driver"
-        iniset $NOVA_CONF DEFAULT compute_driver "openvz.driver.OpenVzDriver"
+        iniset $NOVA_CONF DEFAULT compute_driver "openvz.OpenVzDriver"
         iniset $NOVA_CONF DEFAULT connection_type "openvz"
         LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
         iniset $NOVA_CONF DEFAULT firewall_driver "$LIBVIRT_FIREWALL_DRIVER"