Merge lp:~heut2008/nova/lp1178745 into lp:~openstack-ubuntu-testing/nova/folsom

[Yaguang Tang]

Unmerged revisions

488. By Yaguang Tang on 2014-02-18

fix inconsistent connectivity between instances with floating IPs

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-23 20:14:51 +0000
+++ debian/changelog	2014-02-18 11:28:57 +0000
@@ -1,3 +1,10 @@
+nova (2012.2.4-0ubuntu4) quantal; urgency=low
+
+  * Fix Inconsistent connectivity between instances with floating IPs:
+    - debian/patches/fix-connectivity-using-floating-ips.patch(LP: #1178745)
+
+ -- Yaguang Tang (Yaguang) <[e-mail]>  Tue, 18 Feb 2014 18:57:57 +0800
+
 nova (2012.2.4-0ubuntu3) UNRELEASED; urgency=low
 
   * Dropped patches, applied upstream:

=== added file 'debian/patches/fix-connectivity-using-floating-ips.patch'
--- debian/patches/fix-connectivity-using-floating-ips.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-connectivity-using-floating-ips.patch	2014-02-18 11:28:57 +0000
@@ -0,0 +1,11 @@
+Index: b/nova/network/linux_net.py
+===================================================================
+--- a/nova/network/linux_net.py 2014-01-14 12:54:59.463316598 +0800
++++ b/nova/network/linux_net.py 2014-01-14 12:55:17.167316873 +0800
+@@ -642,6 +642,8 @@
+         rule += ' -o %s' % device
+     return [('PREROUTING', '-d %s -j DNAT --to %s' % (floating_ip, fixed_ip)),
+             ('OUTPUT', '-d %s -j DNAT --to %s' % (floating_ip, fixed_ip)),
++            ('POSTROUTING', '-s %s -m conntrack --ctstate DNAT -j SNAT '
++             '--to-source %s' %(fixed_ip, floating_ip)),
+             ('float-snat', rule)]

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-05-23 20:17:13 +0000
+++ debian/patches/series	2014-02-18 11:28:57 +0000
@@ -4,3 +4,4 @@
 fix-docs-build-without-network.patch
 avoid_setuptools_git_dependency.patch
 rbd-security.patch
+fix-connectivity-using-floating-ips.patch