diff options
author | Matt Thode <prometheanfire@gentoo.org> | 2015-08-05 02:35:47 +0000 |
---|---|---|
committer | Matt Thode <prometheanfire@gentoo.org> | 2015-08-05 02:35:47 +0000 |
commit | c5e82abdaf88425bf02ca6c25bfd5e55dc5db45d (patch) | |
tree | fd4aff8b8b64c74328e534043432ee6ed7780450 /sys-cluster | |
parent | removing old nova (diff) | |
download | historical-c5e82abdaf88425bf02ca6c25bfd5e55dc5db45d.tar.gz historical-c5e82abdaf88425bf02ca6c25bfd5e55dc5db45d.tar.bz2 historical-c5e82abdaf88425bf02ca6c25bfd5e55dc5db45d.zip |
removing the old and jankey
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA
Diffstat (limited to 'sys-cluster')
8 files changed, 23 insertions, 907 deletions
diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog index 6e5d0c32e0bc..b2ff3bedc727 100644 --- a/sys-cluster/neutron/ChangeLog +++ b/sys-cluster/neutron/ChangeLog @@ -1,6 +1,14 @@ # 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.68 2015/07/29 23:45:24 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.69 2015/08/05 02:35:31 prometheanfire Exp $ + + 05 Aug 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, + -files/cve-2015-3221_2014.2.3.ebuild, -neutron-2014.2.3-r1.ebuild, + -neutron-2014.2.9999.ebuild: + removing the old and jankey *neutron-2015.1.1 (29 Jul 2015) diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest index 4ed24966ac64..9189f8b27755 100644 --- a/sys-cluster/neutron/Manifest +++ b/sys-cluster/neutron/Manifest @@ -1,10 +1,6 @@ -----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 cve-2015-3221_2014.2.3.ebuild 6463 SHA256 9e622fc01b8e2c0ea39d6d66080e244aa20d3a1a850985b33e13bf1a43f10bea SHA512 d6e7277c067c87bc25d757c5648f65ded3bd2bd532cb132e67fa64802d2a77276892d569f4d818a00d3fbac5ee6c2a3df4b084bd6a0a1fcd9c0af59c8dffddbe WHIRLPOOL 88062fc6cc8d1e6bca24d7b8c6e47410caaeef7736e79e287ffedbe25747a3d79afad290260a732bade9142a4ea80f5ae18e1cdc4b4b9fb4fea2143e9f87e4a7 AUX cve-2015-3221_2015.1.0.patch 5245 SHA256 95e2ec047ed2f2b04a2c4d0730237804fd33149b1579877c17ad16d2e78526e4 SHA512 46a9f355ca37bbcbc5a424f4da7061de498863f6b6c5adc137bdbb312261f6d49fb8f425d050c41171d7d647206c80d99af046e37808c46c1251028dd2ff2964 WHIRLPOOL 612b78705b3d7edb5fb7824d24e8a37db25842c285878d4582f71b4b190df654590c95013a777effbd6af41ebae6974c93d1a542a5a10243eef954828561b0bb AUX neutron-dhcp-agent.confd 75 SHA256 e36fe3d370ad2b4c82ccf1f4caac60882334d93e3abd7e0e6e268d23cb069d71 SHA512 94cf300c9a9d0275e4fcab4ffdb7e29ca26b73c120d6ff683b48ea0e9c21e46123289522aedd295e4d5d28307133b50084541a90a48db456802d675eed6c2d3e WHIRLPOOL 9e77fe1ef65fa8ef46f8272ddea7213a46e71c6f2884eab20f09eaddc977f5cc202c8529c1a75347132c667e4e2d39d5bdd3ab2c94812c4b1f95f398af75c38c AUX neutron-l3-agent.confd 73 SHA256 560997f3e40d90ef885483e4bd02728bf88720378238fc5e6b3b2abb2ba9dd0e SHA512 4a902c5621abc124424bdad97de8959f63f7c846b4c7b9b3ccaab5522ff3e6938acf748df269980484228d4fc13d2f1e3e3670619207e3c88ea5dd5373699e0a WHIRLPOOL 653156dbbff34606fa0694bab622eb40c2ead171b1ad0a0c934285a50f15db4d8927e40ebff8d2ffe64078a8a079d48a2834e68b049c11a68417dc3945374cb8 @@ -15,29 +11,26 @@ AUX neutron-ovs-cleanup.confd 102 SHA256 a5d5aa7ba2794f593e65c8c87888f29867a817d AUX neutron-server.confd 70 SHA256 40d09a699fc3bced40c5a9dc7394a76c40c245b579fc270909966e11485564d7 SHA512 79f1a40486c37b2c3486b4ef015864f6b20ee89b05d788ce6ade8af934e2c160da9e0495d22e941a717072c1d8ca3b77963a3ec06f3ec25a3f8af8b24a4e40a0 WHIRLPOOL 59f9ac13d58fd76014090988c642d4cb244d51726fb5733cc30e7fbba5c22226ef955f8e8021dad04ab457df0fe5879d13af8c40a6913d03c15bffb48cf4a5ac AUX neutron.initd 792 SHA256 2170e60f05a3f41b47b80def27195fc3b67517adcdf8c6d53765cc8c552861d5 SHA512 aeaef18f5b0f29b9eddb2d76a640cd3e11af6bd211d837c2158e46f369aeebb915d5ca1deb354970fabe788478a3c6cb82f1886a85bdbdae9205c8017a89f0f4 WHIRLPOOL 77bd8b0eed45ab62314379239e19915b1368f8fbe069d22fa36ceab730780a920b6cbbb5aef85b053cfd66716775499689c874e91bcbc0c296a52140a26e7fab AUX neutron.sudoersd 117 SHA256 b40ea04a95deedbb66fe504df61b55905cbd746e5ba26321c01cd25b5cc9dcbe SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366 WHIRLPOOL bb0e35d7b7471fab424f86f181601bc87d4bba98f4fbc282cc6302a05128992613097afe1fea159e9c718cd688a03c280b53d72bfe47fc91bd24967a4b4618da -DIST neutron-2014.2.3.tar.gz 2077226 SHA256 1af8df2a2ef4294e76546325a16ccb8ede001eee0392b877b80cfd04a48862dc SHA512 51eb9e6319a5368b77ef187210d0bcb76fe587e41f4a55bbb677ba940eda084fd93b186de95813b38fcf0d101f10b62b4d558bb342ef42850a417bb611d04295 WHIRLPOOL c536a6937bd4b88e9a6ba84d52fdddcd481791d34982878eab51d95ac0bd78aa79f37751283ebc3613db91bb3b648b3190b93ad697281bc33baf88f365a6df9f DIST neutron-2015.1.0.tar.gz 2038600 SHA256 02672a5316e637d122bb13cd2e18ee4df0df279ddd70262fa7d4102943ec33b6 SHA512 205181228a34469b2f079135fd871adfc5156d9c046f59d1347798015403530131b6f790346be31349333acd6d3f00dd818876b1c7a73a675214387482d0715d WHIRLPOOL 558a16b3c84425ac9e14960895cc7d67f26f618f47e6b24e53592555e282d49fbd52feed3da616cb576942fabef36b54fb979273071605ecbd32ba980c28f5a3 DIST neutron-2015.1.1.tar.gz 2049496 SHA256 91569feaacc983635f64bc27f3903162526e984778aa6683129e578715f8c5b9 SHA512 aa9712a0d44efc2d52f47a2dfac449fb57b82bef675ea5d64b950859780240fbd441a3f8cd9684afff3c51502f8200c0db3b17471fabbd30724ce92662183fe2 WHIRLPOOL aeb6757f855115eb08d2707db40f54cdd488e67e69eb829ea2b31e83fe029ca3cde24e4520b8d8649da285354b161f47a237181a199cd786552d26f19c66181e -EBUILD neutron-2014.2.3-r1.ebuild 7570 SHA256 516461098ffdafbfb4ae9accb3548629bcccecf32a62404e8b1d5cb199474dcf SHA512 3eea5574336b9adf5b8a5458c990b6d942ad6ca61413bbbb2c819cc02750d2e710b7d472cd9f22abd4de5d0fe279097a70f2662bf89580b2f802f367cfd9929b WHIRLPOOL 25b25992fd325c406fe16faa3a15d6c9bf99793e6fa18b0b69502007bc83f8c185191c40c5cafd2365d5c5cec32755599c8fd3d22b3f48f03ceee96e4400c2a8 -EBUILD neutron-2014.2.9999.ebuild 7534 SHA256 a6bbe0d0c069645b7c31fd8e9913314e51f30ef4d9d344ca8d2f454fbb9a7272 SHA512 630c812b041f66052c6de41f682a42d67746d218e81ddde1d9b0f2b9dc1824d4bb80a7b4f7c011d39b15e2f3f468ebacdbf03c50d3b4bca1140e881b0b2b61b1 WHIRLPOOL 28d17074d7b3e0173827884a0b56fca04c1b53c410bbbf366cb9e69f03149d036d02933841d35ad289a55d9a66220ba24af8a60ca3e1f4f81a9a0148e1300802 EBUILD neutron-2015.1.0-r2.ebuild 9196 SHA256 dfb9cb516d93b8bd8106c23788f8d63b9eecf1dac6926aec10e4cce968299dab SHA512 6c8c4d9ea6d45bf1a8cfa6a0d293cf5ead63b23ad41b4735719eedc9fca49e1f618bded18e9fd8976c78e253640a3c3c619f05b71459d93c79c17b17bd989817 WHIRLPOOL 79811f09a7d8f998eb81c318ed3471bd6d4bf4b066ab0ba5ce7368f051d9d0ecdb3c35bd434faa12e651e10c2d73b47beff352020eb8353d3891e619cb857fa5 EBUILD neutron-2015.1.1.ebuild 9298 SHA256 62573396ee1e7393ecf850be6e466d86616de17d80e3c551ac6e44a67bda2ce4 SHA512 f95a554977f3a03b9532050501687f9369e303b8c2a4d57e024f25056d3f4f6b0bdc7b88453eaab246113b4de7e356e0809754e16a23796adb6ffe5632ae9bf8 WHIRLPOOL 6b82355da72d8a000fa8fd345ef41059d758b1dae46eefc1261de7e5834e44685bf7e632125db2e52b378dd259aa1b05261d4f132b67ddd9d49600904b5a6e56 EBUILD neutron-2015.1.9999.ebuild 9309 SHA256 91a9b1f7ecbca8ef68d4f876d5459bcd3b86e30d94c36b717a3e941309aa5be6 SHA512 82f001c81d5e35e104705b584962a8afe56d554b795c6c28287e19fd60b9aae41c17da0242b15e01e24864e660a566b26a374ca189dc286b94f7f44ba4dd8940 WHIRLPOOL f988d189e98922373c52a16467a30362f58836643b84d142e4a2aa9812722d4cc3357587ebf805e30c6112940ec90dba1579a0a85be2bb0d646d3df0f495ae6f -MISC ChangeLog 18296 SHA256 0980b0dec41959221e3ac6ab35be554abdead97b6c8c97df3ee9f428d42e9a9c SHA512 340c39f8a562ca430d2142572c02f83dde8e4dece3f7523c9c41b0e05fcacb521224562ad6e468b41d2a904168ca722cc44c845fb469f56d6f414d70fcbe4009 WHIRLPOOL 2d1bc1f7fc163a9b6a9866d7ef1c6f7fc281fc2a8a3643ae2433a9e512ecf3da5bc4fb23d07158793400c5337b473f31b0dde42e3bf3ca2045a98ac92a357fe5 +MISC ChangeLog 18698 SHA256 4a6446fb01cf1d8399a4ce110d6eb6ab16544e5620f9fdc5971310a096366f63 SHA512 ba2d79f13f48cb97014e803c285e236bf51121b759109485d60cbb5d1abda48edb041a1040a9c291f3bc57ee116b44baba3b861c26a8c17549fcb986ba790f38 WHIRLPOOL a1edadb7c8edc01c01a1c23b01a37998bf2551988b6f08d602ceda8eb6b1d371f644a28d734504fbead7af94e90665fd4c59eeb3fd1b61c599abfee1fec1e3b1 MISC metadata.xml 1456 SHA256 d106fe0b2c0065842dba18c09e7197e6929e3f828fc438b598ae43adfa93d97b SHA512 e52b4e877e4136940bb86c7097aa68943aff48a53ee87bf0e447f8219c5831bdcce503eaf5bfec01ac3cc637a3f1fcfe693130e077d24bc96c63a0456bd8e36a WHIRLPOOL 37a64b4b88e3d51bc0265c02a8e17c0831d3d32facb7b4308c8bf00d1d4d3413b43ea10e982af6b6d837c4f7afb89c92947e51dc2bf664f4422310765d9b45d2 -----BEGIN PGP SIGNATURE----- -iQIcBAEBCAAGBQJVuWXiAAoJEGSje+quGaTols0P/2IQdahbP4sQxFj9TOSh10Qw -HYF7R/USTFvZrp384KkkOB4RW4KZTYUwBu6d7qVnQ22F+zj7pCqPejwFtcvSLetM -7M8ETCFcGDcAQvwAtW/7XwiGzMFAeP60QX20MZv5pBDmfb5Bx63dwpB1G2x8CVOF -6kh5WXv8LNOU5H46XhNicLeAG46OUhaQH/fCSoJoj4JJc36Sb4hxc/2yYhJyKTVo -cxqkybhViRy3yCEwKtEZpl65fvOhzDXBPtBWwdgEj3Wlwzy9YjjCOCoEFNdI5hp+ -/a9i50Z2hTdb5L2XMQgNUmr7tn7HNWZekcJHSHcTx/ILAHyMI6FeghUDDbZXjkmi -WzdSZubWjlagD4K/g11GN/RQL50uCl+J5ndybPSdxzoSPfmVjCyKJBLZj0dTISSN -D21BMVtQPA5PFv3nEa7L0UP8uS2p2L+ZpbMJO2LlU3u7LH56ywdFe0uOZYAb+w+m -ACPkWqNK9/xcYwSs3IwYjqV8U6/D7hvPIxok6o/AyuPAGy/LtnGicbFFzrkJZ9EL -ehT6GYgo/YJg+DIbXnr6V5bZfEHVVKD3OuojMvzpkax6679wteS6mkDdvnzvD/Sw -cE8zNkEm5Ol+WOh4nTZmRFnARC/jaSptQdm0UgHYToAKRsKL5UohHRvg6wd3QBkj -9oD5TVQGVepcFrHP0XIt -=AAfD +iQIcBAEBCAAGBQJVwXbJAAoJEGSje+quGaTo4RYP/A8jCzH5/CJgdYfldhAzvEa/ +Dc85l49ECoPUvGcSDPeXJKbA8hy9bunT5iKjcvD/VNhV9QvIyurIYEuzq6waWoew +N4AdNfqyJ6wCKWawL/18bqygMR59+KGKejUUCGewXTgHCiGBIubi4SGB8sBChQHl +N8N89Y7F68ZCfqqxkWyJUUtODR3u2Md3ANM0CHryKED/8KN3J0aICv26dk2N6A/z +4JDjYLYf7a3NLdIUopkRdQLGmOuccKI+DFyQzWQp/YEyoIP0CxK38Eo86bFnSLvd +MnBKrCKxs78JR6Z9mq7G8IOsKomKLAxe3q6BsPuKazdS1nbLp/5O8ynoLH7K+XQ0 +lu/va+2V+2GSVerSCG9p61hpj7Rl7/o6Pxq7x/wpGNMR7R79zLZCNnvv0q+aiSUO +eQAX98xfVCrx8kn/mByyRX2HhpIvQvH+qkXYjCzrV6ZGem524I0viRvVSD177tf+ +MpnSegkQGRREYLYKwpTa0Es98WH/6239qs5+o4iopdf6Nh//nzv4VLtPLytLyT9Y +qlDE/o8UalFQpO8CMrAMy5E9iF2mFjth1YwbUwYNI/oRaV0IGqoUKju9sljOtHFZ +PiATBCji4G7pUPQSCO9V12htH2gK2v3QHfXBF8WTIOuHhuB2lDQqK9SaVg2f7i4f +a3NDr+/9x/zjiSROt3EA +=CFa5 -----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 deleted file mode 100644 index 23f8cc6621ff..000000000000 --- a/sys-cluster/neutron/files/0001-Fixes-bug-in-interface-handling-of-ip_lib.py.patch +++ /dev/null @@ -1,73 +0,0 @@ -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 deleted file mode 100644 index 3b22bec2c265..000000000000 --- a/sys-cluster/neutron/files/0002-moving-vxlan-module-check-to-sanity-checks-and-makin.patch +++ /dev/null @@ -1,210 +0,0 @@ -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 deleted file mode 100644 index 59283d48a535..000000000000 --- a/sys-cluster/neutron/files/0003-fixes-error-logging-to-use-the-right-exception-paren.patch +++ /dev/null @@ -1,29 +0,0 @@ -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/files/cve-2015-3221_2014.2.3.ebuild b/sys-cluster/neutron/files/cve-2015-3221_2014.2.3.ebuild deleted file mode 100644 index 18cf37d92d40..000000000000 --- a/sys-cluster/neutron/files/cve-2015-3221_2014.2.3.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -From ac8fb28a920c7a6284d41f7cce054ea1b2e73cb1 Mon Sep 17 00:00:00 2001 -From: Aaron Rosen <aaronorosen@gmail.com> -Date: Thu, 11 Jun 2015 13:58:16 -0700 -Subject: [PATCH] Disable allowed_address_pair ip 0.0.0.0/0 ::/0 for ipset - -Previously, the ipset_manager would pass in 0.0.0.0/0 or ::/0 if -these addresses were inputted as allowed address pairs. This causes -ipset to raise an error as it does not work with zero prefix sizes. -To solve this problem we use two ipset rules to represent this. - -This was correctly fixed in a backport to kilo though we did not have the -cycles to backport this exact fix to juno as in juno additional work needs to -be done because the iptable and ipset code are interleaved together. This -patch fixes this issue by disabling one from creating an address pair of -zero lenght. This patch also provides a small tool which one should run: -tools/fix_zero_length_ip_prefix.py which changes all zero length address_pair -rules into two address pair rules of: - -Ipv4: 0.0.0.0/1 and 128.0.0.1/1 -IPv6: ::/1' and '8000::/1 - -to avoid the problem. -After this patch is merged into juno it will be easier for us to apply -a better change to allow /0 addresses again in juno. - -Closes-bug: 1461054 -Co-Authored-by: Darragh O'Reilly <darragh.oreilly@hp.com> ---- - neutron/extensions/allowedaddresspairs.py | 9 +++- - .../unit/test_extension_allowedaddresspairs.py | 5 ++ - tools/fix_zero_length_ip_prefix.py | 59 ++++++++++++++++++++++ - 3 files changed, 72 insertions(+), 1 deletion(-) - create mode 100755 tools/fix_zero_length_ip_prefix.py - -diff --git a/neutron/extensions/allowedaddresspairs.py b/neutron/extensions/allowedaddresspairs.py -index 6588d5f..a773a17 100644 ---- a/neutron/extensions/allowedaddresspairs.py -+++ b/neutron/extensions/allowedaddresspairs.py -@@ -12,6 +12,7 @@ - # License for the specific language governing permissions and limitations - # under the License. - -+import netaddr - import webob.exc - - from neutron.api.v2 import attributes as attr -@@ -46,6 +47,10 @@ class AllowedAddressPairExhausted(nexception.BadRequest): - "exceeds the maximum %(quota)s.") - - -+class AllowedAddressPairsZeroPrefixNotAllowed(nexception.InvalidInput): -+ message = _("AllowedAddressPair CIDR cannot have prefix length zero") -+ -+ - def _validate_allowed_address_pairs(address_pairs, valid_values=None): - unique_check = {} - if len(address_pairs) > cfg.CONF.max_allowed_address_pair: -@@ -77,7 +82,9 @@ def _validate_allowed_address_pairs(address_pairs, valid_values=None): - set(['mac_address', 'ip_address']))) - raise webob.exc.HTTPBadRequest(msg) - -- if '/' in ip_address: -+ if (netaddr.IPNetwork(ip_address).prefixlen == 0): -+ raise AllowedAddressPairsZeroPrefixNotAllowed() -+ elif '/' in ip_address: - msg = attr._validate_subnet(ip_address) - else: - msg = attr._validate_ip_address(ip_address) -diff --git a/neutron/tests/unit/test_extension_allowedaddresspairs.py b/neutron/tests/unit/test_extension_allowedaddresspairs.py -index bcaa11b..f15c402 100644 ---- a/neutron/tests/unit/test_extension_allowedaddresspairs.py -+++ b/neutron/tests/unit/test_extension_allowedaddresspairs.py -@@ -140,6 +140,11 @@ class TestAllowedAddressPairs(AllowedAddressPairDBTestCase): - self.deserialize(self.fmt, res) - self.assertEqual(res.status_int, 409) - -+ def test_create_port_zero_prefix_ip(self): -+ address_pairs = [{'mac_address': 'invalid_mac', -+ 'ip_address': '0.0.0.0/0'}] -+ self._create_port_with_address_pairs(address_pairs, 400) -+ - def test_create_port_bad_mac(self): - address_pairs = [{'mac_address': 'invalid_mac', - 'ip_address': '10.0.0.1'}] -diff --git a/tools/fix_zero_length_ip_prefix.py b/tools/fix_zero_length_ip_prefix.py -new file mode 100755 -index 0000000..dbbafb5 ---- /dev/null -+++ b/tools/fix_zero_length_ip_prefix.py -@@ -0,0 +1,59 @@ -+""" -+This script is needed to convert addresses that are zero prefix to be two -+address of one prefix to avoid a bug that exists in juno where the ipset -+manager isn't able to handle zero prefix lenght addresses. -+""" -+ -+import os -+import sys -+ -+import netaddr -+from neutronclient.v2_0 import client -+ -+ -+def main(): -+ try: -+ username = os.environ['OS_USERNAME'] -+ tenant_name = os.environ['OS_TENANT_NAME'] -+ password = os.environ['OS_PASSWORD'] -+ auth_url = os.environ['OS_AUTH_URL'] -+ except KeyError: -+ print("You need to source your openstack creds file first!") -+ sys.exit(1) -+ -+ neutron = client.Client(username=username, -+ tenant_name=tenant_name, -+ password=password, -+ auth_url=auth_url) -+ -+ ports = neutron.list_ports() -+ for port in ports['ports']: -+ new_address_pairs = [] -+ needs_update = False -+ allowed_address_pairs = port.get('allowed_address_pairs') -+ if allowed_address_pairs: -+ for address_pair in allowed_address_pairs: -+ ip = address_pair['ip_address'] -+ mac = address_pair['mac_address'] -+ if(netaddr.IPNetwork(ip).prefixlen == 0): -+ needs_update = True -+ if(netaddr.IPNetwork(ip).version == 4): -+ new_address_pairs.append({'ip_address': '0.0.0.0/1', -+ 'mac_address': mac}) -+ new_address_pairs.append({'ip_address': '128.0.0.0/1', -+ 'mac_address': mac}) -+ elif(netaddr.IPNetwork(ip).version == 6): -+ new_address_pairs.append({'ip_address': '::/1', -+ 'mac_address': mac}) -+ new_address_pairs.append({'ip_address': '8000::/1', -+ 'mac_address': mac}) -+ else: -+ new_address_pairs.append(address_pair) -+ if needs_update: -+ print ("Updating port %s with new address_pairs %s" % -+ (port['id'], new_address_pairs)) -+ neutron.update_port( -+ port['id'], -+ {'port': {'allowed_address_pairs': new_address_pairs}}) -+ -+main() --- -1.9.1 diff --git a/sys-cluster/neutron/neutron-2014.2.3-r1.ebuild b/sys-cluster/neutron/neutron-2014.2.3-r1.ebuild deleted file mode 100644 index eeb68995909e..000000000000 --- a/sys-cluster/neutron/neutron-2014.2.3-r1.ebuild +++ /dev/null @@ -1,211 +0,0 @@ -# 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.3-r1.ebuild,v 1.1 2015/07/02 05:43:05 prometheanfire Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 linux-info user - -DESCRIPTION="A virtual network service for Openstack" -HOMEPAGE="https://launchpad.net/neutron" -SRC_URI="http://launchpad.net/${PN}/juno/${PV}/+download/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="dhcp doc l3 metadata openvswitch linuxbridge server test sqlite mysql postgres" -REQUIRED_USE="|| ( mysql postgres sqlite )" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/pbr-0.8[${PYTHON_USEDEP}] - <dev-python/pbr-1.0[${PYTHON_USEDEP}] - app-admin/sudo - test? ( - ${RDEPEND} - >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}] - <dev-python/hacking-0.10[${PYTHON_USEDEP}] - >=dev-python/cliff-1.7.0[${PYTHON_USEDEP}] - >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] - >=dev-python/mock-1.0[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - dev-python/ordereddict[${PYTHON_USEDEP}] - >=dev-python/requests-mock-0.4.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] - <dev-python/sphinx-1.3[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] - !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - >=dev-python/webtest-2.0[${PYTHON_USEDEP}] - dev-python/configobj[${PYTHON_USEDEP}] - )" - -RDEPEND=" - dev-python/paste[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}] - >=dev-python/Babel-1.3[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}] - <dev-python/eventlet-0.16.0[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] - >=dev-python/requests-2.1.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.4.0[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}] - dev-python/jsonrpclib[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] - <=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}] - sqlite? ( - >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - dev-python/mysql-python - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - ) - postgres? ( - dev-python/psycopg:2 - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - ) - >=dev-python/webob-1.2.3[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}] - >=dev-python/alembic-0.6.4[${PYTHON_USEDEP}] - >=dev-python/six-1.7.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}] - <dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}] - !~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}] - <dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}] - >=dev-python/oslo-rootwrap-1.3.0[${PYTHON_USEDEP}] - >=dev-python/python-novaclient-2.18.0[${PYTHON_USEDEP}] - dev-python/pyudev[${PYTHON_USEDEP}] - sys-apps/iproute2 - net-misc/bridge-utils - net-firewall/ipset - openvswitch? ( net-misc/openvswitch ) - 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" - "${FILESDIR}/cve-2015-3221_2014.2.3.ebuild" -) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \ - IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \ - NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES" - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel" - done - fi - enewgroup neutron - enewuser neutron -1 -1 /var/lib/neutron neutron -} - -pkg_config() { - fperms 0700 /var/log/neutron - fowners neutron:neutron /var/log neutron -} - -src_prepare() { - #it's /bin/ip not /sbin/ip - sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* - distutils-r1_src_prepare -} - -python_compile_all() { - use doc && make -C doc html -} - -python_test() { - # https://bugs.launchpad.net/neutron/+bug/1234857 - # https://bugs.launchpad.net/swift/+bug/1249727 - # https://bugs.launchpad.net/neutron/+bug/1251657 - # turn multiprocessing off, testr will use it --parallel - local DISTUTILS_NO_PARALLEL_BUILD=1 - # Move tests out that attempt net connection, have failures - mv $(find . -name test_ovs_tunnel.py) . || die - sed -e 's:test_app_using_ipv6_and_ssl:_&:' \ - -e 's:test_start_random_port_with_ipv6:_&:' \ - -i neutron/tests/unit/test_wsgi.py || die - testr init - testr run --parallel || die "failed testsuite under python2.7" -} - -python_install() { - distutils-r1_python_install - if use server; then - newinitd "${FILESDIR}/neutron.initd" "neutron-server" - newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" - dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini - fi - if use dhcp; then - newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent" - newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent" - fi - if use l3; then - newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent" - newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent" - fi - if use metadata; then - newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent" - newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent" - fi - if use openvswitch; then - newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent" - newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent" - newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup" - newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup" - fi - if use linuxbridge; then - newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent" - newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent" - fi - diropts -m 755 -o neutron -g neutron - dodir /var/log/neutron /var/lib/neutron - keepdir /etc/neutron - insinto /etc/neutron - insopts -m 0640 -o neutron -g neutron - - doins etc/* - # stupid renames - rm "${D}etc/neutron/quantum" - insinto /etc/neutron - doins -r "etc/neutron/plugins" - insopts -m 0640 -o root -g root - doins "etc/rootwrap.conf" - doins -r "etc/neutron/rootwrap.d" - - insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/" - doins -r "neutron/db/migration/alembic_migrations/versions" - - #add sudoers definitions for user neutron - insinto /etc/sudoers.d/ - insopts -m 0440 -o root -g root - newins "${FILESDIR}/neutron.sudoersd" neutron - - #remove superfluous stuff - rm -R "${D}/usr/etc/" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/build/html/. ) - distutils-r1_python_install_all -} diff --git a/sys-cluster/neutron/neutron-2014.2.9999.ebuild b/sys-cluster/neutron/neutron-2014.2.9999.ebuild deleted file mode 100644 index 98f8b6de1217..000000000000 --- a/sys-cluster/neutron/neutron-2014.2.9999.ebuild +++ /dev/null @@ -1,211 +0,0 @@ -# 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.13 2015/04/13 03:27:20 prometheanfire Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 git-2 linux-info user - -DESCRIPTION="A virtual network service for Openstack" -HOMEPAGE="https://launchpad.net/neutron" -EGIT_REPO_URI="https://github.com/openstack/neutron.git" -EGIT_BRANCH="stable/juno" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" -IUSE="dhcp doc l3 metadata openvswitch linuxbridge server test sqlite mysql postgres" -REQUIRED_USE="|| ( mysql postgres sqlite )" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/pbr-0.8[${PYTHON_USEDEP}] - <dev-python/pbr-1.0[${PYTHON_USEDEP}] - app-admin/sudo - test? ( - ${RDEPEND} - >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}] - <dev-python/hacking-0.10[${PYTHON_USEDEP}] - >=dev-python/cliff-1.7.0[${PYTHON_USEDEP}] - >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] - >=dev-python/mock-1.0[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - dev-python/ordereddict[${PYTHON_USEDEP}] - >=dev-python/requests-mock-0.4.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] - <dev-python/sphinx-1.3[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] - !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - >=dev-python/webtest-2.0[${PYTHON_USEDEP}] - dev-python/configobj[${PYTHON_USEDEP}] - )" - -RDEPEND=" - dev-python/paste[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}] - >=dev-python/Babel-1.3[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}] - <dev-python/eventlet-0.16.0[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] - >=dev-python/requests-2.1.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.4.0[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}] - dev-python/jsonrpclib[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] - <=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}] - sqlite? ( - >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - dev-python/mysql-python - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - ) - postgres? ( - dev-python/psycopg:2 - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - ) - >=dev-python/webob-1.2.3[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}] - >=dev-python/alembic-0.6.4[${PYTHON_USEDEP}] - >=dev-python/six-1.7.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}] - <dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}] - !~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}] - <dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}] - >=dev-python/oslo-rootwrap-1.3.0[${PYTHON_USEDEP}] - >=dev-python/python-novaclient-2.18.0[${PYTHON_USEDEP}] - dev-python/pyudev[${PYTHON_USEDEP}] - sys-apps/iproute2 - net-misc/bridge-utils - net-firewall/ipset - openvswitch? ( net-misc/openvswitch ) - 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() { - linux-info_pkg_setup - CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \ - IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \ - NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES" - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel" - done - fi - enewgroup neutron - enewuser neutron -1 -1 /var/lib/neutron neutron -} - -pkg_config() { - fperms 0700 /var/log/neutron - fowners neutron:neutron /var/log neutron -} - -src_prepare() { - #it's /bin/ip not /sbin/ip - sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* - distutils-r1_src_prepare -} - -python_compile_all() { - use doc && make -C doc html -} - -python_test() { - # https://bugs.launchpad.net/neutron/+bug/1234857 - # https://bugs.launchpad.net/swift/+bug/1249727 - # https://bugs.launchpad.net/neutron/+bug/1251657 - # turn multiprocessing off, testr will use it --parallel - local DISTUTILS_NO_PARALLEL_BUILD=1 - # Move tests out that attempt net connection, have failures - mv $(find . -name test_ovs_tunnel.py) . || die - sed -e 's:test_app_using_ipv6_and_ssl:_&:' \ - -e 's:test_start_random_port_with_ipv6:_&:' \ - -i neutron/tests/unit/test_wsgi.py || die - testr init - testr run --parallel || die "failed testsuite under python2.7" -} - -python_install() { - distutils-r1_python_install - if use server; then - newinitd "${FILESDIR}/neutron.initd" "neutron-server" - newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" - dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini - fi - if use dhcp; then - newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent" - newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent" - fi - if use l3; then - newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent" - newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent" - fi - if use metadata; then - newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent" - newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent" - fi - if use openvswitch; then - newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent" - newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent" - newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup" - newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup" - fi - if use linuxbridge; then - newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent" - newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent" - fi - diropts -m 755 -o neutron -g neutron - dodir /var/log/neutron /var/lib/neutron - keepdir /etc/neutron - insinto /etc/neutron - insopts -m 0640 -o neutron -g neutron - - doins etc/* - # stupid renames - rm "${D}etc/neutron/quantum" - insinto /etc/neutron - doins -r "etc/neutron/plugins" - insopts -m 0640 -o root -g root - doins "etc/rootwrap.conf" - doins -r "etc/neutron/rootwrap.d" - - insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/" - doins -r "neutron/db/migration/alembic_migrations/versions" - - #add sudoers definitions for user neutron - insinto /etc/sudoers.d/ - insopts -m 0440 -o root -g root - newins "${FILESDIR}/neutron.sudoersd" neutron - - #remove superfluous stuff - rm -R "${D}/usr/etc/" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/build/html/. ) - distutils-r1_python_install_all -} |