commit f59f2f459044f9f01dd3d6403cc5430a18006565
author Jenkins <jenkins@review.openstack.org> Fri Jul 13 21:11:54 2012 +0000
committer Gerrit Code Review <review@openstack.org> Fri Jul 13 21:11:54 2012 +0000
tree e7e7a71b454a766a5a9b838896e503e616e0393e
parent dc33dd43f606a2811527e69e808fa66818118985
parent e0e91d2c697522083827abc0f20637ab01b28e2d

Merge "convert from connection_type to compute_driver"

stack.sh

diff --git a/stack.sh b/stack.sh
index f83f7a6..8a20d5d 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1818,7 +1818,7 @@
 
 if [ "$VIRT_DRIVER" = 'xenserver' ]; then
     read_password XENAPI_PASSWORD "ENTER A PASSWORD TO USE FOR XEN."
-    add_nova_opt "connection_type=xenapi"
+    add_nova_opt "compute_driver=xenapi.XenAPIDriver"
     XENAPI_CONNECTION_URL=${XENAPI_CONNECTION_URL:-"http://169.254.0.1"}
     XENAPI_USER=${XENAPI_USER:-"root"}
     add_nova_opt "xenapi_connection_url=$XENAPI_CONNECTION_URL"
@@ -1829,7 +1829,7 @@
     XEN_FIREWALL_DRIVER=${XEN_FIREWALL_DRIVER:-"nova.virt.firewall.IptablesFirewallDriver"}
     add_nova_opt "firewall_driver=$XEN_FIREWALL_DRIVER"
 else
-    add_nova_opt "connection_type=libvirt"
+    add_nova_opt "compute_driver=libvirt.LibvirtDriver"
     LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
     add_nova_opt "firewall_driver=$LIBVIRT_FIREWALL_DRIVER"
 fi