backporting patches from kilo for better usage in juno

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

7 files changed, 350 insertions, 19 deletions

diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index 509c7eabedd6..39d06f1225bf 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-cluster/neutron
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.53 2015/02/09 05:06:59 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.54 2015/02/13 00:58:41 prometheanfire Exp $
+
+*neutron-2014.2.2-r1 (13 Feb 2015)
+
+  13 Feb 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +files/0001-Fixes-bug-in-interface-handling-of-ip_lib.py.patch,
+  +files/0002-moving-vxlan-module-check-to-sanity-checks-and-makin.patch,
+  +files/0003-fixes-error-logging-to-use-the-right-exception-paren.patch,
+  +neutron-2014.2.2-r1.ebuild, -neutron-2014.2.2.ebuild,
+  neutron-2014.2.9999.ebuild:
+  backporting patches from kilo for better usage in juno
 
   09 Feb 2015; Matthew Thode <prometheanfire@gentoo.org>
   neutron-2014.2.2.ebuild, neutron-2014.2.9999.ebuild:
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 88cbd818cc0b..84ed950d35f6 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1,6 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0001-Fixes-bug-in-interface-handling-of-ip_lib.py.patch 3346 SHA256 f9c382ff3a90653c0356c84847b53b677719ecb37ceb3ee60fd61e72a3c64dbe SHA512 5d99f94b003042d9ee676cad00d051335db72e351842a8ce876740cec556282ac1936ebf3c7355ca785907e745eb0de03bc00fa4b727106afd43632cc54bce0e WHIRLPOOL 28f086275d41d36699286a0e5f8295801cdae8acd37ac3b24c06137cc061f88b5c6cf5d166f1ddafd8b96d7eff51aea4a52fa819d582eb5d854edb5583c4e77a
+AUX 0002-moving-vxlan-module-check-to-sanity-checks-and-makin.patch 9421 SHA256 554ba93fedfd892191ee980f90832aef45d02f639422b6c08bed21e8eb6fdbe1 SHA512 57db212fa09d86e224568822d5f162143b3ac5cd5f27be199fd1c2f89fa25e856e24b09a90c566457ad14beabdc934b3282a3d20dc330377ea6464d45b056ab7 WHIRLPOOL 2a2daf0cbfb298fdf64e328883ef42110c9541de7087b087778fc3ca37c5090da1a25eb73b8fca24bfd78e2166704c5cc0442f92b58756e3b28008be0512a53f
+AUX 0003-fixes-error-logging-to-use-the-right-exception-paren.patch 954 SHA256 b7db04721a0a0322575623678cd33d3852f16fa3770af4aa12b8cecf7101291d SHA512 ea7e96bb22ac2636da7dbc5b5ead7954fa6d87a2e49998e66e1e0e126d30e3091dbecc8c6ac49b27e9da8edb3b4ca3556923911628f7affd53b9096f44f4da2d WHIRLPOOL 11c3b0a65620d31d652abc2736db2fa22181846191f1a7bf7ae8ed8db3553cb70177965c7689447e73bc0f1ede0724fae8e45eb204ee3d5f6ae9f141099ddaa8
 AUX neutron-dhcp-agent.confd 75 SHA256 e36fe3d370ad2b4c82ccf1f4caac60882334d93e3abd7e0e6e268d23cb069d71 SHA512 94cf300c9a9d0275e4fcab4ffdb7e29ca26b73c120d6ff683b48ea0e9c21e46123289522aedd295e4d5d28307133b50084541a90a48db456802d675eed6c2d3e WHIRLPOOL 9e77fe1ef65fa8ef46f8272ddea7213a46e71c6f2884eab20f09eaddc977f5cc202c8529c1a75347132c667e4e2d39d5bdd3ab2c94812c4b1f95f398af75c38c
 AUX neutron-l3-agent.confd 73 SHA256 560997f3e40d90ef885483e4bd02728bf88720378238fc5e6b3b2abb2ba9dd0e SHA512 4a902c5621abc124424bdad97de8959f63f7c846b4c7b9b3ccaab5522ff3e6938acf748df269980484228d4fc13d2f1e3e3670619207e3c88ea5dd5373699e0a WHIRLPOOL 653156dbbff34606fa0694bab622eb40c2ead171b1ad0a0c934285a50f15db4d8927e40ebff8d2ffe64078a8a079d48a2834e68b049c11a68417dc3945374cb8
 AUX neutron-linuxbridge-agent.confd 100 SHA256 d829f07e9062065ba1079a32f9de99b980e8ef818767ddf890c009b6b89a89e0 SHA512 3c999af9b63284218c630b3c73a047f4bb5ef36bd9eb8a2a10c08fe23e3836f276d13ad40b19f6698d49ec2ee6587e62ded9079851b2af5618456082badc1921 WHIRLPOOL dd354818597ea5e93a2cc9bb6a1e750450c4a1b6f513729d64b59c35c3074627a1ad543c5f8b20cc68afe928496633719dd503ca7b58416ca348ab1c96c27933
@@ -11,24 +14,24 @@ AUX neutron-server.confd 70 SHA256 40d09a699fc3bced40c5a9dc7394a76c40c245b579fc2
 AUX neutron.initd 792 SHA256 2170e60f05a3f41b47b80def27195fc3b67517adcdf8c6d53765cc8c552861d5 SHA512 aeaef18f5b0f29b9eddb2d76a640cd3e11af6bd211d837c2158e46f369aeebb915d5ca1deb354970fabe788478a3c6cb82f1886a85bdbdae9205c8017a89f0f4 WHIRLPOOL 77bd8b0eed45ab62314379239e19915b1368f8fbe069d22fa36ceab730780a920b6cbbb5aef85b053cfd66716775499689c874e91bcbc0c296a52140a26e7fab
 AUX neutron.sudoersd 117 SHA256 b40ea04a95deedbb66fe504df61b55905cbd746e5ba26321c01cd25b5cc9dcbe SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366 WHIRLPOOL bb0e35d7b7471fab424f86f181601bc87d4bba98f4fbc282cc6302a05128992613097afe1fea159e9c718cd688a03c280b53d72bfe47fc91bd24967a4b4618da
 DIST neutron-2014.2.2.tar.gz 2071312 SHA256 6b0509f7bc12a52ef4e90e1464720cd240eb93f0db2eef7d109d51fdb836a412 SHA512 af307f67d79ca66829992b1c953028231d64dfc78fd52f1ba256aac9663769fbeb5e0d0b9fe29c65b21178e7e8c700f5cc564ec888c860844d4be64ffe0880a2 WHIRLPOOL e72374bf093f22ac8871dc89f46d4a210dec8060859309e01426b4a46f4be71ba44af97cda92448f6b7d3c4c9cd66aa25ce232740e446fa0d527f2e4467f694e
-EBUILD neutron-2014.2.2.ebuild 7258 SHA256 29692620c88ad46e54f262e7b063286ee9c0c86a288cb4c10d3df045358602e0 SHA512 72d579b6ec4a268a05eee1182e4e56d0ea96a5dd0476b9dbb83fb9f9bacaa80ed94e3f54e7b4f6c673c04670ecf92b668fa34e461bb81c2be1e0cb0b0d1eb137 WHIRLPOOL ac330f09292dc1dc4cc75b7b80c59823154c08f246a76e4b93f98838f2f139cc6b5261bff15f654b0aaf490572fba0d4e33d814009d849a1766987d7a86f99ff
-EBUILD neutron-2014.2.9999.ebuild 7269 SHA256 4c5e1cb8a8ca5c6402b30c7810e4c4f5e5abf296719a384466291f51fb9b1b45 SHA512 5ccfa67fe2caa45a5cb511e9034113a5f2102a3576f34c53dad68b548b2286f89bdc68298ff6aec67735833b6b144789585da85820c11b135c16584bcba66a8c WHIRLPOOL efd99fb558587876839b9ea47b15163aa3d47c2842a4d2fd51de04c226ba430cf03f5e37a32cd1f6b8a8cbdcc86576f1b178d238ea72161295308c4f4a819c53
-MISC ChangeLog 15371 SHA256 30d6a368f4120ea44d3f5ec53eb51b4fadab453ddcea38b88e4aedc8d5fc64a3 SHA512 c48dfb79e943812058f7b5d287dfd235658c006caefa5d80020fbf4141049bce34e649b04fe759c1751c132b7cc4afff60efa782177bf4ca1c9531ebcade2659 WHIRLPOOL 9dfbf40cde3e13bc2552f65131b8fbcbc1866ea0ce6607660dc3b55255e1fa049f5796e0a1b1a2e6490ee94ebf0124feed8552b39f19ec8732d3e175ae6227ff
+EBUILD neutron-2014.2.2-r1.ebuild 7490 SHA256 9530d6edfe485876f42754e2dc53223463e462913727aa68011597a412172090 SHA512 48c133eb2f4fbc1826776b3b1ad0af7819784ca345241f479c729d5137c3342be2ed91a0f020cf4fd22147f8cc9299b3336c9e173111fe4c9dc50cc61e653a66 WHIRLPOOL a5d62d2e19f4cc8c26e6fd98720f15a251a93660fd07e91e1b6e625b13582d59c457544c5782eaa2420e68bda14eeadec0fad93e581cea42433241b75414b740
+EBUILD neutron-2014.2.9999.ebuild 7499 SHA256 991e3d30e8f75893929f8c1e17445513cd8fd0a71c495bac12410671d01b32b7 SHA512 3a27e6fdf2e3e009aff6161384411c93f438947d2bff423e106a58d0c2a09c79dabc97721fc231bdb507cb06b0d4adf33000812fa42426984d5235ad3ca074de WHIRLPOOL 00559732a3e8fc78f5ecd076f7cd37b81e93eacd57f5a2d0695796eee0de539cb47e7905141747658320015ba97575d78c45776f9eda2d0f36cb3518a10ab10e
+MISC ChangeLog 15823 SHA256 ec0f0552ba07bdbdc88111ea2e8c36d9a8188ccf711d5cde804829a6148c20c7 SHA512 f7dc19635eb4986cffc7e203e19377209892924b8f15e9527b9d571284a6bee1c76a9666bc4b815474acb1129b38e5395ded83518faa6490b5e2e902906e630b WHIRLPOOL 67e1327b0e9382b74b48cd2389df1449788dca06dfc874c7e4b94011ae8b24aac01f6683fb24a979bdc8257d665418b5010ca240ce2ed235cd52c5b7886eab3d
 MISC metadata.xml 1296 SHA256 7d6de6c9dc0602e7ea1147c40e8798aa61e01a891eade2b291628850d52889ab SHA512 e49d4872a6fefdb93f20665cf1a176744a1eaa3c068617dbb41e2591d084776d55334997c8046d725e84f5a7280481392f3fccf42f6cb02bbf1751d43076c49d WHIRLPOOL 0b3e08407b951bffdaa54e646d35c000e5b1df43381132386b77056e26773d6344ec7ace4b7a87ae14f29090fcdd490f05730ece3597b8e7a2d4389dfe816312
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU2ECPAAoJEGSje+quGaTo2rUQAKHoZX/1EWFqjZWKZe5zAqA+
-KpkMf9sHf75E4IX+pRYYwF4eUNU2mZrbk09AJGLxMsYOz36UfuQtO6zZuVbHLSys
-sIKEwGevrBLRSFfSF7qWjUj7HzO0LwJtaZ8Vjy4o0m8yPGg8c0XI0QQjD04AnWty
-x74ZDk1/jH+omtk/IDut7RRZtnFL7VvdsdtweRmvvr1vjg6d3vWRt73f+zSX9q7E
-P+dAb/I7jxtjs9wdxAI3JBHC+tHBwEh6TqToc5iT1dkWzQGtQeU4zddqWyEsKLjt
-8hw8DScsHW7BV1g0G/0wyxrhXEINgN0PxHJuk6+SI5yxZXiUsnNJ1MuI07TC3yGw
-2HdfpsIqkolwEKudza0ECK/cfU3JOtV45sb4JlFlOWUlCVcPz624SAEUvKRTU0Nh
-f3LYiWsHh+PPDus3qqCyUu/PwwsBdOvurNp2zcZK2Tdvh4iY8SgOKY0AuHsqI9V9
-+yNhOpAqTWxc91n2Jnrhs4g0JEhdDHadBgQplA9QEkhOwdlIAf1d9DL70Q68fPJS
-0tr94YSjj8/JQBR1pnNBbCHh1U6LQo4ulK2zBGTRAxAZ/egZzfK9vU1y8myllQP3
-/K44VpEui4NnK3Z7Poy24j1308qI72/6F1pTt6ynpjONi4E1Q/4Oqd6Fd1CiJd+o
-GN7BFNbh5W/LXT9DLiUW
-=osDz
+iQIcBAEBCAAGBQJU3UxgAAoJEGSje+quGaToLNoP/jPuECYQl7IgsLS6CgxtpiH7
+pg+QZTWYtGlhWRhuoza0RR8jnUKH+o3FX62pQliPSkWIJKTBMpYoetfCMQMzukq4
+4zW73rEP6BS9+2wrxNgxMMOfH+KfmiihldDe1RTsRiNW8jCdj+Fqgx9kagj2Vddy
+fYMBlYt2G6o6dlQGmOGLhPysWYd+DpPdVsv+J4F3I2653hLYx4gSJSPWqvgHHdEg
+KQMg+kJ3sE9ZeFqDsSPLruwK9ylZfIQuENKuh/0WCvSE/NNyoIfd8KK4uhv2RL87
+WkkdlB6jttgj7GNkVGokGUHgQnD3Yl7oC4fAJIUhHr0f2D77Fo8YssEZsefHloNK
+2o5ZaPjiRLKeRDgXye6TyHzZnGm3BArPGpyPIQEZCHXtXb/u49Agy10/XxA4gKoR
+k3Q1noX+EsxqyIWuiV3qUFTnf970wzdCaAzRxg5y7fCOn3nIC4CvkQVbqXZEgg/v
+4ytQ2aAZn8ospMbTs70YTB9rfJtjIMDcyRlPweudXo9HHFBLAoZRx+Wfo+z7pQyZ
+N+0LpAR79VGRKSbV4dveMY5PcZCK4aGDvJy3THgtpxm3JruGK7XKe41tdop2SC6f
+epZQpwT66OTnMKclHchiHsO+otycZBqwd5kDTGtpiNJqYBG4/iZk/LFJCqLbOE6J
+O6IEfY/NFbhYvuWtOi3R
+=6nzW
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/neutron/files/0001-Fixes-bug-in-interface-handling-of-ip_lib.py.patch b/sys-cluster/neutron/files/0001-Fixes-bug-in-interface-handling-of-ip_lib.py.patch
new file mode 100644
index 000000000000..23f8cc6621ff
--- /dev/null
+++ b/sys-cluster/neutron/files/0001-Fixes-bug-in-interface-handling-of-ip_lib.py.patch
@@ -0,0 +1,73 @@
+From f3100ad343759ad32435766df33b0384cd15629d Mon Sep 17 00:00:00 2001
+From: Matthew Thode <mthode@mthode.org>
+Date: Mon, 9 Feb 2015 11:02:58 -0600
+Subject: [PATCH 1/3] Fixes bug in interface handling of ip_lib.py
+
+ip_lib was parsing tunnel links incorrectly, we know what to delimit on
+when we see interfaces with @NONE in their name
+
+@NONE is appended to the interface name by iproute2 when a tunnel is not
+connected to it's remote endpoint, this patch adds allows for handling
+that situation.
+
+Change-Id: I07d1d297f07857d216649cccf717896574aac301
+Closes-Bug: 1374663
+---
+ neutron/agent/linux/ip_lib.py           |  3 +++
+ neutron/tests/unit/test_linux_ip_lib.py | 12 +++++++++---
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/neutron/agent/linux/ip_lib.py b/neutron/agent/linux/ip_lib.py
+index 1d32a54..b2264d2 100644
+--- a/neutron/agent/linux/ip_lib.py
++++ b/neutron/agent/linux/ip_lib.py
+@@ -109,6 +109,9 @@ class IPWrapper(SubProcessBase):
+             if len(tokens) == 3:
+                 if any(v in tokens[2] for v in VLAN_INTERFACE_DETAIL):
+                     delimiter = '@'
++                # tunnel interfaces can have @NONE in their name as well
++                elif '@NONE' in tokens[1]:
++                    delimiter = '@'
+                 else:
+                     delimiter = ':'
+                 name = tokens[1].rpartition(delimiter)[0].strip()
+diff --git a/neutron/tests/unit/test_linux_ip_lib.py b/neutron/tests/unit/test_linux_ip_lib.py
+index 2b9486d..41f9caa 100644
+--- a/neutron/tests/unit/test_linux_ip_lib.py
++++ b/neutron/tests/unit/test_linux_ip_lib.py
+@@ -70,7 +70,11 @@ LINK_SAMPLE = [
+     '14: bar@bar:bar@eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 '
+     'qdisc mq state UP qlen 1000'
+     '\    link/ether cc:dd:ee:ff:ab:cd brd ff:ff:ff:ff:ff:ff promiscuity 0'
+-    '\    vlan protocol 802.1Q id 14 <REORDER_HDR>']
++    '\    vlan protocol 802.1Q id 14 <REORDER_HDR>',
++    '15: gre0@NONE: <NOARP> mtu 1476 qdisc noqueue state DOWN mode DEFAULT '
++    'group default '
++    '\    link/gre 0.0.0.0 brd 0.0.0.0 promiscuity 0 '
++    '\    gre remote any local any ttl inherit nopmtudisc']
+ 
+ ADDR_SAMPLE = ("""
+ 2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP qlen 1000
+@@ -221,7 +225,8 @@ class TestIpWrapper(base.BaseTestCase):
+                           ip_lib.IPDevice('bar:bar'),
+                           ip_lib.IPDevice('bar@bar'),
+                           ip_lib.IPDevice('bar:bar@bar'),
+-                          ip_lib.IPDevice('bar@bar:bar')])
++                          ip_lib.IPDevice('bar@bar:bar'),
++                          ip_lib.IPDevice('gre0')])
+ 
+         self.execute.assert_called_once_with(['o', 'd'], 'link', ('list',),
+                                              'sudo', None)
+@@ -243,7 +248,8 @@ class TestIpWrapper(base.BaseTestCase):
+                           ip_lib.IPDevice('bar:bar'),
+                           ip_lib.IPDevice('bar@bar'),
+                           ip_lib.IPDevice('bar:bar@bar'),
+-                          ip_lib.IPDevice('bar@bar:bar')])
++                          ip_lib.IPDevice('bar@bar:bar'),
++                          ip_lib.IPDevice('gre0')])
+ 
+         self.execute.assert_called_once_with(['o', 'd'], 'link', ('list',),
+                                              'sudo', None)
+-- 
+2.0.5
+
diff --git a/sys-cluster/neutron/files/0002-moving-vxlan-module-check-to-sanity-checks-and-makin.patch b/sys-cluster/neutron/files/0002-moving-vxlan-module-check-to-sanity-checks-and-makin.patch
new file mode 100644
index 000000000000..3b22bec2c265
--- /dev/null
+++ b/sys-cluster/neutron/files/0002-moving-vxlan-module-check-to-sanity-checks-and-makin.patch
@@ -0,0 +1,210 @@
+From d6d4b8171908ac08196e7f08395f451168ad19dc Mon Sep 17 00:00:00 2001
+From: Matthew Thode <mthode@mthode.org>
+Date: Wed, 10 Dec 2014 15:12:25 -0600
+Subject: [PATCH 2/3] moving vxlan module check to sanity checks and making
+ practical
+
+Instead of checking via modinfo (which only checks if a module is
+available) this checks actual usage, which is a more reliable way of
+testing real world problems.
+
+Change-Id: Ida78652ed50e2cb16fa0ab7194d8468714b99d61
+Closes-Bug: 1339197
+---
+ neutron/cmd/sanity/checks.py                       | 10 ++++++++-
+ neutron/cmd/sanity_check.py                        | 25 ++++++++++++++++++++--
+ .../linuxbridge/agent/linuxbridge_neutron_agent.py | 11 ----------
+ neutron/tests/functional/sanity/test_sanity.py     |  5 ++++-
+ .../unit/linuxbridge/test_lb_neutron_agent.py      | 24 ++-------------------
+ 5 files changed, 38 insertions(+), 37 deletions(-)
+
+diff --git a/neutron/cmd/sanity/checks.py b/neutron/cmd/sanity/checks.py
+index da37663..4700668 100644
+--- a/neutron/cmd/sanity/checks.py
++++ b/neutron/cmd/sanity/checks.py
+@@ -25,13 +25,21 @@ from neutron.plugins.openvswitch.common import constants as ovs_const
+ LOG = logging.getLogger(__name__)
+ 
+ 
+-def vxlan_supported(root_helper, from_ip='192.0.2.1', to_ip='192.0.2.2'):
++def ovs_vxlan_supported(root_helper, from_ip='192.0.2.1', to_ip='192.0.2.2'):
+     name = "vxlantest-" + utils.get_random_string(6)
+     with ovs_lib.OVSBridge(name, root_helper) as br:
+         port = br.add_tunnel_port(from_ip, to_ip, const.TYPE_VXLAN)
+         return port != ovs_lib.INVALID_OFPORT
+ 
+ 
++def iproute2_vxlan_supported(root_helper):
++    ip = ip_lib.IPWrapper(root_helper)
++    name = "vxlantest-" + utils.get_random_string(4)
++    port = ip.add_vxlan(name, 3000)
++    ip.del_veth(name)
++    return name == port.name
++
++
+ def patch_supported(root_helper):
+     seed = utils.get_random_string(6)
+     name = "patchtest-" + seed
+diff --git a/neutron/cmd/sanity_check.py b/neutron/cmd/sanity_check.py
+index 4b1be1b..90bf792 100644
+--- a/neutron/cmd/sanity_check.py
++++ b/neutron/cmd/sanity_check.py
+@@ -25,6 +25,13 @@ from oslo.config import cfg
+ LOG = logging.getLogger(__name__)
+ cfg.CONF.import_group('AGENT', 'neutron.plugins.openvswitch.common.config')
+ cfg.CONF.import_group('OVS', 'neutron.plugins.openvswitch.common.config')
++<<<<<<< HEAD
++=======
++cfg.CONF.import_group('VXLAN', 'neutron.plugins.linuxbridge.common.config')
++cfg.CONF.import_group('ml2', 'neutron.plugins.ml2.config')
++cfg.CONF.import_group('ml2_sriov',
++                      'neutron.plugins.ml2.drivers.mech_sriov.mech_driver')
++>>>>>>> moving vxlan module check to sanity checks and making practical
+ 
+ 
+ class BoolOptCallback(cfg.BoolOpt):
+@@ -34,7 +41,7 @@ class BoolOptCallback(cfg.BoolOpt):
+ 
+ 
+ def check_ovs_vxlan():
+-    result = checks.vxlan_supported(root_helper=cfg.CONF.AGENT.root_helper)
++    result = checks.ovs_vxlan_supported(root_helper=cfg.CONF.AGENT.root_helper)
+     if not result:
+         LOG.error(_('Check for Open vSwitch VXLAN support failed. '
+                     'Please ensure that the version of openvswitch '
+@@ -42,6 +49,15 @@ def check_ovs_vxlan():
+     return result
+ 
+ 
++def check_iproute2_vxlan():
++    result = checks.iproute2_vxlan_supported(
++                root_helper=cfg.CONF.AGENT.root_helper)
++    if not result:
++        LOG.error(_LE('Check for iproute2 VXLAN support failed. Please ensure '
++                      'that the iproute2 has VXLAN support.'))
++    return result
++
++
+ def check_ovs_patch():
+     result = checks.patch_supported(root_helper=cfg.CONF.AGENT.root_helper)
+     if not result:
+@@ -74,7 +90,9 @@ def check_arp_responder():
+ # Define CLI opts to test specific features, with a calback for the test
+ OPTS = [
+     BoolOptCallback('ovs_vxlan', check_ovs_vxlan, default=False,
+-                    help=_('Check for vxlan support')),
++                    help=_('Check for OVS vxlan support')),
++    BoolOptCallback('iproute2_vxlan', check_iproute2_vxlan, default=False,
++                    help=_('Check for iproute2 vxlan support')),
+     BoolOptCallback('ovs_patch', check_ovs_patch, default=False,
+                     help=_('Check for patch port support')),
+     BoolOptCallback('nova_notify', check_nova_notify, default=False,
+@@ -92,6 +110,9 @@ def enable_tests_from_config():
+ 
+     if 'vxlan' in cfg.CONF.AGENT.tunnel_types:
+         cfg.CONF.set_override('ovs_vxlan', True)
++    if ('vxlan' in cfg.CONF.ml2.type_drivers or
++            cfg.CONF.VXLAN.enable_vxlan):
++        cfg.CONF.set_override('iproute2_vxlan', True)
+     if cfg.CONF.AGENT.tunnel_types:
+         cfg.CONF.set_override('ovs_patch', True)
+     if not cfg.CONF.OVS.use_veth_interconnection:
+diff --git a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
+index d9f7f68..b540269 100755
+--- a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
++++ b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
+@@ -561,19 +561,8 @@ class LinuxBridgeManager:
+             return False
+         return True
+ 
+-    def vxlan_module_supported(self):
+-        try:
+-            utils.execute(cmd=['modinfo', 'vxlan'], log_fail_as_error=False)
+-            return True
+-        except RuntimeError:
+-            return False
+-
+     def check_vxlan_support(self):
+         self.vxlan_mode = lconst.VXLAN_NONE
+-        if not self.vxlan_module_supported():
+-            LOG.error(_('Linux kernel vxlan module and iproute2 3.8 or above '
+-                        'are required to enable VXLAN.'))
+-            raise exceptions.VxlanNetworkUnsupported()
+ 
+         if self.vxlan_ucast_supported():
+             self.vxlan_mode = lconst.VXLAN_UCAST
+diff --git a/neutron/tests/functional/sanity/test_sanity.py b/neutron/tests/functional/sanity/test_sanity.py
+index bbe8911..b959138 100644
+--- a/neutron/tests/functional/sanity/test_sanity.py
++++ b/neutron/tests/functional/sanity/test_sanity.py
+@@ -45,7 +45,10 @@ class SanityTestCaseRoot(functional_base.BaseSudoTestCase):
+         self.check_sudo_enabled()
+ 
+     def test_ovs_vxlan_support_runs(self):
+-        checks.vxlan_supported(self.root_helper)
++        checks.ovs_vxlan_supported(self.root_helper)
++
++    def test_iproute2_vxlan_support_runs(self):
++        checks.iproute2_vxlan_supported(self.root_helper)
+ 
+     def test_ovs_patch_support_runs(self):
+         checks.patch_supported(self.root_helper)
+diff --git a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
+index 1a2bbc4..09a5d78 100644
+--- a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
++++ b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
+@@ -829,11 +829,9 @@ class TestLinuxBridgeManager(base.BaseTestCase):
+             self.lbm.delete_vlan("eth1.1")
+             self.assertTrue(exec_fn.called)
+ 
+-    def _check_vxlan_support(self, expected, vxlan_module_supported,
+-                             vxlan_ucast_supported, vxlan_mcast_supported):
++    def _check_vxlan_support(self, expected, vxlan_ucast_supported,
++                             vxlan_mcast_supported):
+         with contextlib.nested(
+-            mock.patch.object(self.lbm, 'vxlan_module_supported',
+-                              return_value=vxlan_module_supported),
+             mock.patch.object(self.lbm, 'vxlan_ucast_supported',
+                               return_value=vxlan_ucast_supported),
+             mock.patch.object(self.lbm, 'vxlan_mcast_supported',
+@@ -848,37 +846,19 @@ class TestLinuxBridgeManager(base.BaseTestCase):
+ 
+     def test_check_vxlan_support(self):
+         self._check_vxlan_support(expected=lconst.VXLAN_UCAST,
+-                                  vxlan_module_supported=True,
+                                   vxlan_ucast_supported=True,
+                                   vxlan_mcast_supported=True)
+         self._check_vxlan_support(expected=lconst.VXLAN_MCAST,
+-                                  vxlan_module_supported=True,
+                                   vxlan_ucast_supported=False,
+                                   vxlan_mcast_supported=True)
+ 
+         self._check_vxlan_support(expected=lconst.VXLAN_NONE,
+-                                  vxlan_module_supported=False,
+                                   vxlan_ucast_supported=False,
+                                   vxlan_mcast_supported=False)
+         self._check_vxlan_support(expected=lconst.VXLAN_NONE,
+-                                  vxlan_module_supported=True,
+                                   vxlan_ucast_supported=False,
+                                   vxlan_mcast_supported=False)
+ 
+-    def _check_vxlan_module_supported(self, expected, execute_side_effect):
+-        with mock.patch.object(
+-                utils, 'execute',
+-                side_effect=execute_side_effect):
+-            self.assertEqual(expected, self.lbm.vxlan_module_supported())
+-
+-    def test_vxlan_module_supported(self):
+-        self._check_vxlan_module_supported(
+-            expected=True,
+-            execute_side_effect=None)
+-        self._check_vxlan_module_supported(
+-            expected=False,
+-            execute_side_effect=RuntimeError())
+-
+     def _check_vxlan_ucast_supported(
+             self, expected, l2_population, iproute_arg_supported, fdb_append):
+         cfg.CONF.set_override('l2_population', l2_population, 'VXLAN')
+-- 
+2.0.5
+
diff --git a/sys-cluster/neutron/files/0003-fixes-error-logging-to-use-the-right-exception-paren.patch b/sys-cluster/neutron/files/0003-fixes-error-logging-to-use-the-right-exception-paren.patch
new file mode 100644
index 000000000000..59283d48a535
--- /dev/null
+++ b/sys-cluster/neutron/files/0003-fixes-error-logging-to-use-the-right-exception-paren.patch
@@ -0,0 +1,29 @@
+From bda65afcedcbf44efda5f1e5fa430dd672ef5142 Mon Sep 17 00:00:00 2001
+From: Matthew Thode <mthode@mthode.org>
+Date: Sun, 1 Feb 2015 00:13:59 -0600
+Subject: [PATCH 3/3] fixes error logging to use the right exception parent
+ class
+
+looks like this was missed
+
+Closes-Bug: #1416798
+Change-Id: If68c13b550d665dfa24b7380f53bee7f6fccdb23
+---
+ neutron/plugins/ml2/plugin.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py
+index a41ffc2..c7c4c4c 100644
+--- a/neutron/plugins/ml2/plugin.py
++++ b/neutron/plugins/ml2/plugin.py
+@@ -1054,7 +1054,6 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
+                            one())
+             except sa_exc.NoResultFound:
+                 return
+-            except exc.MultipleResultsFound:
+                 LOG.error(_("Multiple ports have port_id starting with %s"),
+                           port_id)
+                 return
+-- 
+2.0.5
+
diff --git a/sys-cluster/neutron/neutron-2014.2.2.ebuild b/sys-cluster/neutron/neutron-2014.2.2-r1.ebuild
index 55e79af46c2d..bb8d5ce9562d 100644
--- a/sys-cluster/neutron/neutron-2014.2.2.ebuild
+++ b/sys-cluster/neutron/neutron-2014.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.2.2.ebuild,v 1.2 2015/02/09 05:06:59 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.2.2-r1.ebuild,v 1.1 2015/02/13 00:58:41 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -99,6 +99,9 @@ RDEPEND="
 	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
 
 PATCHES=(
+	"${FILESDIR}/0001-Fixes-bug-in-interface-handling-of-ip_lib.py.patch"
+	"${FILESDIR}/0002-moving-vxlan-module-check-to-sanity-checks-and-makin.patch"
+	"${FILESDIR}/0003-fixes-error-logging-to-use-the-right-exception-paren.patch"
 )
 
 pkg_setup() {
diff --git a/sys-cluster/neutron/neutron-2014.2.9999.ebuild b/sys-cluster/neutron/neutron-2014.2.9999.ebuild
index 3d08afcae4e1..5b7d25e7782a 100644
--- a/sys-cluster/neutron/neutron-2014.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2014.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.2.9999.ebuild,v 1.9 2015/02/09 05:06:59 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.2.9999.ebuild,v 1.10 2015/02/13 00:58:41 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -100,6 +100,9 @@ RDEPEND="
 	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
 
 PATCHES=(
+	"${FILESDIR}/0001-Fixes-bug-in-interface-handling-of-ip_lib.py.patch"
+	"${FILESDIR}/0002-moving-vxlan-module-check-to-sanity-checks-and-makin.patch"
+	"${FILESDIR}/0003-fixes-error-logging-to-use-the-right-exception-paren.patch"
 )
 
 pkg_setup() {