Merge lp:~gandelman-a/nova/connection_type_fix into lp:~ubuntu-server-dev/nova/essex

[Adam Gandelman]

[lp:~gandelman-a/nova/connection_type_fix]

282. By Adam Gandelman on 2012-01-24

debian/nova-compute-{kvm,xen,uml,lxc}.conf: Move connection_type to nova.conf so migrations from postinst work until Bug #921294 is addressed

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-24 21:55:18 +0000
+++ debian/changelog	2012-01-24 23:55:27 +0000
@@ -1,10 +1,16 @@
 nova (2012.1~e3~20120120.12170-0ubuntu1) UNRELEASED; urgency=low
 
+  [Chuck short]
   * debian/patches/fix-nova-rootwraper-env.patch: Dropped
     no longer needed.
   * debian/nova-compute-{kvm,xen,uml,lxc}.conf: Add the connection
     type "--connection=libvirt" since libvirt is no longer the default.
 
+
+  [Adam Gandelman]
+  * debian/nova.conf: Define connection_type=libvirt in common nova.conf
+    instead of nova-compute-*.conf until Bug #921294 is addressed.
+
  -- Chuck Short <[e-mail]>  Tue, 24 Jan 2012 14:48:24 -0500
 
 nova (2012.1~e3~20120120.12170-0ubuntu1) precise; urgency=low
 
=== modified file 'debian/nova-compute-kvm.conf'
--- debian/nova-compute-kvm.conf	2012-01-24 21:55:18 +0000
+++ debian/nova-compute-kvm.conf	2012-01-24 23:55:27 +0000
@@ -1,2 +1,1 @@
---connection_type=libvirt
 --libvirt_type=kvm
 
=== modified file 'debian/nova-compute-lxc.conf'
--- debian/nova-compute-lxc.conf	2012-01-24 21:55:18 +0000
+++ debian/nova-compute-lxc.conf	2012-01-24 23:55:27 +0000
@@ -1,2 +1,1 @@
---connection_type=libvirt
 --libvirt_type=lxc
 
=== modified file 'debian/nova-compute-uml.conf'
--- debian/nova-compute-uml.conf	2012-01-24 21:55:18 +0000
+++ debian/nova-compute-uml.conf	2012-01-24 23:55:27 +0000
@@ -1,2 +1,1 @@
---connection_type=libvirt
 --libvirt_type=uml
 
=== modified file 'debian/nova-compute-xen.conf'
--- debian/nova-compute-xen.conf	2012-01-24 21:55:18 +0000
+++ debian/nova-compute-xen.conf	2012-01-24 23:55:27 +0000
@@ -1,2 +1,1 @@
---connection_type=libvirt
 --libvirt_type=xen
 
=== modified file 'debian/nova.conf'
--- debian/nova.conf	2012-01-20 01:32:42 +0000
+++ debian/nova.conf	2012-01-24 23:55:27 +0000
@@ -6,5 +6,6 @@
 --force_dhcp_release
 --iscsi_helper=tgtadm
 --libvirt_use_virtio_for_bridges
+--connection_type=libvirt
 --root_helper=sudo nova-rootwrap
 --verbose