[openstack-nova/f17] enable libguestfs image inspection

[Pádraig Brady]

commit 1383e29ee73f25d11147037459552fee24813e08
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Jun 8 15:52:10 2012 +0100

    enable libguestfs image inspection
    
    This should now be stable enough to enable in Fedora 17
    and RHEL 6.3.  Previously it would fail for example
    with common images used with openstack.
    (cherry picked from commit 8a23c8aeef7dc7aa6815108030e8abfe36408474)
    
    Conflicts:
    
    	openstack-nova.spec

 nova.conf           |    1 +
 openstack-nova.spec |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/nova.conf b/nova.conf
index 7cb9931..3e024e8 100644
--- a/nova.conf
+++ b/nova.conf
@@ -8,6 +8,7 @@ force_dhcp_release = True
 injected_network_template = /usr/share/nova/interfaces.template
 libvirt_xml_template = /usr/share/nova/libvirt.xml.template
 libvirt_nonblocking = True
+libvirt_inject_partition = -1
 vpn_client_template = /usr/share/nova/client.ovpn.template
 credentials_template = /usr/share/nova/novarc.template
 network_manager = nova.network.manager.FlatDHCPManager
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 1c8439c..4a44d19 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-nova
 Version:          2012.1
-Release:          7%{?dist}
+Release:          8%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -416,6 +416,9 @@ fi
 %endif
 
 %changelog
+* Wed Jun 08 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-8
+- Enable libguestfs image inspection
+
 * Wed Jun 06 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-7
 - Sync up with Essex stable branch, including...
 - Fix for protocol case handling (#829440, CVE-2012-2654)