From 7d66725e5a1e5438453aedcec809f8a25fae08d8 Mon Sep 17 00:00:00 2001
From: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date: Tue, 25 Jan 2011 11:10:26 -0800
Subject: Fix for LP Bug #707554

---
 nova/virt/libvirt_conn.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 259e19a69..d5db42543 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -1268,13 +1268,13 @@ class IptablesFirewallDriver(FirewallDriver):
             if(ip_version == 4):
                 # Allow DHCP responses
                 dhcp_server = self._dhcp_server_for_instance(instance)
-                our_rules += ['-A %s -s %s -p udp --sport 67 --dport 68' %
-                                                 (chain_name, dhcp_server)]
+                our_rules += ['-A %s -s %s -p udp --sport 67 --dport 68 '
+			      '-j ACCEPT' % (chain_name, dhcp_server)]
             elif(ip_version == 6):
                 # Allow RA responses
                 ra_server = self._ra_server_for_instance(instance)
-                our_rules += ['-A %s -s %s -p icmpv6' %
-                                                 (chain_name, ra_server)]
+                our_rules += ['-A %s -s %s -p icmpv6 '
+			      '-j ACCEPT' % (chain_name, ra_server)]
 
             # If nothing matches, jump to the fallback chain
             our_rules += ['-A %s -j nova-fallback' % (chain_name,)]
-- 
cgit 


From 83213922360b68f3a1c26c6b0a319a21f390ffb7 Mon Sep 17 00:00:00 2001
From: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date: Tue, 25 Jan 2011 11:46:24 -0800
Subject: updated authors since build is failing

---
 Authors | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Authors b/Authors
index 608fec523..33895be74 100644
--- a/Authors
+++ b/Authors
@@ -49,6 +49,7 @@ Soren Hansen <soren.hansen@rackspace.com>
 Thierry Carrez <thierry@openstack.org>
 Todd Willey <todd@ansolabs.com>
 Trey Morris <trey.morris@rackspace.com>
+Tushar Patil <tushar.vitthal.patil@gmail.com> <tpatil@vertex.co.in>
 Vishvananda Ishaya <vishvananda@gmail.com>
 Youcef Laribi <Youcef.Laribi@eu.citrix.com>
 Zhixue Wu <Zhixue.Wu@citrix.com>
-- 
cgit 


From 1b259ba6ac7401d99eff2ded3100c73f3048728e Mon Sep 17 00:00:00 2001
From: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date: Tue, 25 Jan 2011 12:38:20 -0800
Subject: Fixed pep8 errors

---
 nova/virt/libvirt_conn.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index d5db42543..548d82ba9 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -1269,12 +1269,12 @@ class IptablesFirewallDriver(FirewallDriver):
                 # Allow DHCP responses
                 dhcp_server = self._dhcp_server_for_instance(instance)
                 our_rules += ['-A %s -s %s -p udp --sport 67 --dport 68 '
-			      '-j ACCEPT' % (chain_name, dhcp_server)]
+                              '-j ACCEPT ' % (chain_name, dhcp_server)]
             elif(ip_version == 6):
                 # Allow RA responses
                 ra_server = self._ra_server_for_instance(instance)
                 our_rules += ['-A %s -s %s -p icmpv6 '
-			      '-j ACCEPT' % (chain_name, ra_server)]
+                              '-j ACCEPT' % (chain_name, ra_server)]
 
             # If nothing matches, jump to the fallback chain
             our_rules += ['-A %s -j nova-fallback' % (chain_name,)]
-- 
cgit