[openstack-packstack] use a less invasive change for previous fix

[Pádraig Brady]

commit c8394d535dc4c010c4f01c22009ae5f6c2f9f89d
Author: Pádraig Brady <P at draigBrady.com>
Date:   Sat Jan 4 05:14:07 2014 +0000

    use a less invasive change for previous fix

 openstack-packstack.spec           |    4 ++--
 packstack-libvirt_vif_driver.patch |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index 61fed81..d578aa0 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -4,7 +4,7 @@
 Name:           openstack-packstack
 Version:        2013.2.1
 #Release:       1%{?dist}
-Release:        0.26.dev%{git_revno}%{?dist}
+Release:        0.27.dev%{git_revno}%{?dist}
 Summary:        Openstack Install Utility
 
 Group:          Applications/System
@@ -108,7 +108,7 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 
 
 %changelog
-* Fri Jan 04 2014 Pádraig Brady <pbrady at redhat.com> - 2013.2.1-0.26.dev936
+* Fri Jan 04 2014 Pádraig Brady <pbrady at redhat.com> - 2013.2.1-0.27.dev936
 - Don't set libvirt_vif_driver no longer supported by nova (rhbz#1048315)
 
 * Fri Dec 20 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2.1-0.25.dev936
diff --git a/packstack-libvirt_vif_driver.patch b/packstack-libvirt_vif_driver.patch
index a6ca7d9..138acda 100644
--- a/packstack-libvirt_vif_driver.patch
+++ b/packstack-libvirt_vif_driver.patch
@@ -1,6 +1,6 @@
-From 56509ebd1b41cfcd27b12828175954219b9211a2 Mon Sep 17 00:00:00 2001
+From 77ebfa6364ab48c2f448c6a9495577622f569ec3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
-Date: Sat, 4 Jan 2014 02:30:11 +0000
+Date: Sat, 4 Jan 2014 05:11:38 +0000
 Subject: [PATCH] remove unsupported libvirt_vif_driver nova.conf setting
 
 This was deprecated in Havana, and unsupported in Icehouse since:
@@ -11,14 +11,14 @@ when setting up OVS with neutron (the default setup).
 
 Change-Id: I7419bea9443dae353ac46191a6d66704b14e3971
 ---
- packstack/plugins/nova_300.py |    5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
+ packstack/plugins/nova_300.py |    5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
 
 diff --git a/packstack/plugins/nova_300.py b/packstack/plugins/nova_300.py
-index c18afd5..fb2f375 100644
+index c18afd5..1db80a7 100644
 --- a/packstack/plugins/nova_300.py
 +++ b/packstack/plugins/nova_300.py
-@@ -575,11 +575,6 @@ def createneutronmanifest(config):
+@@ -575,10 +575,7 @@ def createneutronmanifest(config):
      if controller.CONF['CONFIG_NEUTRON_INSTALL'] != "y":
          return
  
@@ -26,10 +26,10 @@ index c18afd5..fb2f375 100644
 -        controller.CONF['CONFIG_NOVA_LIBVIRT_VIF_DRIVER'] = 'nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver'
 -    else:
 -        controller.CONF['CONFIG_NOVA_LIBVIRT_VIF_DRIVER'] = 'nova.virt.libvirt.vif.LibvirtGenericVIFDriver'
--
++    controller.CONF['CONFIG_NOVA_LIBVIRT_VIF_DRIVER'] = 'nova.virt.libvirt.vif.LibvirtGenericVIFDriver'
+ 
      for manifestfile, marker in manifestfiles.getFiles():
          if manifestfile.endswith("_nova.pp"):
-             data = getManifestTemplate("nova_neutron.pp")
 -- 
 1.7.7.6