[openstack-puppet-modules] Added patch for Nova compute_driver setting

[Martin Mágr]

commit 9c892d76e81987b92dc8a1f28e3fff8fd25347a3
Author: Martin Magr <mmagr at redhat.com>
Date:   Mon Mar 17 19:43:48 2014 +0100

    Added patch for Nova compute_driver setting

 compute_driver.patch          |   13 +++++++++++++
 openstack-puppet-modules.spec |    9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/compute_driver.patch b/compute_driver.patch
new file mode 100644
index 0000000..7fdc9e8
--- /dev/null
+++ b/compute_driver.patch
@@ -0,0 +1,13 @@
+diff --git a/manifests/compute/libvirt.pp b/manifests/compute/libvirt.pp
+index 4b6b57a..d3659bf 100644
+--- a/manifests/compute/libvirt.pp
++++ b/manifests/compute/libvirt.pp
+@@ -48,7 +48,7 @@ class nova::compute::libvirt (
+   }
+ 
+   nova_config {
+-    'DEFAULT/compute_driver':   value => 'libvirt.LibvirtDriver';
++    'DEFAULT/compute_driver':   value => 'nova.virt.libvirt.LibvirtDriver';
+     'DEFAULT/libvirt_type':     value => $libvirt_type;
+     'DEFAULT/connection_type':  value => 'libvirt';
+     'DEFAULT/vncserver_listen': value => $vncserver_listen;
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index d4ac253..5d43381 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -37,7 +37,7 @@
 
 Name:           openstack-puppet-modules
 Version:        2014.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Puppet modules used to deploy OpenStack
 License:        ASL 2.0 and GPLv2 and GPLv3
 
@@ -78,6 +78,7 @@ Source31:	https://github.com/derekhiggins/puppet-vlan/archive/%{vlan_commit}/vla
 Source32:	https://github.com/stackforge/puppet-vswitch/archive/%{vswitch_commit}/vswitch-%{vswitch_commit}.tar.gz
 Source33:	https://github.com/packstack/puppetlabs-xinetd/archive/%{xinetd_commit}/xinetd-%{xinetd_commit}.tar.gz
 
+Patch0:     compute_driver.patch
 
 BuildArch:      noarch
 
@@ -122,6 +123,10 @@ A collection of Puppet modules used to install and configure OpenStack.
 %setup -c -q -T -D -a 32
 %setup -c -q -T -D -a 33
 
+# puppet-nova patches
+cd %{_builddir}/%{name}-%{version}/puppet-nova-%{nova_commit}
+%patch0 -p1
+
 find %{_builddir} -type f -name ".*" -exec rm {} +
 find %{_builddir} -size 0 -exec rm {} +
 find %{_builddir} \( -name "*.pl" -o -name "*.sh"  \) -exec chmod +x {} +
@@ -177,6 +182,8 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
 
 
 %changelog
+* Mon Mar 17 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-3
+- Added compute_driver.patch (rhbz#1044606)
 
 * Tue Mar 11 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-2
 - Synchronized modules with current master branch of redhat-openstack/openstack-puppet-modules