diff options
author | Matt Thode <prometheanfire@gentoo.org> | 2015-07-29 23:45:43 +0000 |
---|---|---|
committer | Matt Thode <prometheanfire@gentoo.org> | 2015-07-29 23:45:43 +0000 |
commit | 69a99a1f723520b96918ac81e283bb36426e8217 (patch) | |
tree | ff897f8bbd57023e1818fb1dea54f9f16fbff6f3 /sys-cluster | |
parent | bup and update of live ebuild deps (diff) | |
download | historical-69a99a1f723520b96918ac81e283bb36426e8217.tar.gz historical-69a99a1f723520b96918ac81e283bb36426e8217.tar.bz2 historical-69a99a1f723520b96918ac81e283bb36426e8217.zip |
bup
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/neutron/ChangeLog | 8 | ||||
-rw-r--r-- | sys-cluster/neutron/Manifest | 25 | ||||
-rw-r--r-- | sys-cluster/neutron/neutron-2015.1.1.ebuild | 252 | ||||
-rw-r--r-- | sys-cluster/neutron/neutron-2015.1.9999.ebuild | 10 |
4 files changed, 283 insertions, 12 deletions
diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog index e59d38b13625..6e5d0c32e0bc 100644 --- a/sys-cluster/neutron/ChangeLog +++ b/sys-cluster/neutron/ChangeLog @@ -1,6 +1,12 @@ # 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.67 2015/07/29 17:51:00 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.68 2015/07/29 23:45:24 prometheanfire Exp $ + +*neutron-2015.1.1 (29 Jul 2015) + + 29 Jul 2015; Matthew Thode <prometheanfire@gentoo.org> + +neutron-2015.1.1.ebuild, neutron-2015.1.9999.ebuild: + bup 29 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> neutron-2015.1.0-r2.ebuild: x86 stable wrt bug #554284 diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest index 3a46f1a51363..4ed24966ac64 100644 --- a/sys-cluster/neutron/Manifest +++ b/sys-cluster/neutron/Manifest @@ -17,18 +17,27 @@ AUX neutron.initd 792 SHA256 2170e60f05a3f41b47b80def27195fc3b67517adcdf8c6d5376 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.9999.ebuild 9168 SHA256 53b178d87ef7c2c6506d1a806cad8eeb21963210ba1861d8e97d4f7ff03205e6 SHA512 f8b9a6b856bfaa32dad67dfb59f30abfc6eaeb93378847ef8abaa2c371b3c0625bd4b605def025817bb859b80b1992c9982d665c8e22c1a6cdbb195a4590912d WHIRLPOOL 5dbab2ac82c0840a07f7b82f78d130c1f42665c19ca89be8cef6dc21a8d8a13859a4492772908fab8b493d79ea06ffd048299f34177e40a6b94fd19575ae4985 -MISC ChangeLog 18136 SHA256 64f681b19865cf41121ef3301cd17d96aa42364253d6583288dc982f26c4ac96 SHA512 408a2451c10b93e38a7be667e20c4e9f336cb43313b14075af94e6bd734eeb9cb34271482205b6102cd8b90da70b4ea0acb481eed3876752fbd980c2543f9777 WHIRLPOOL de52c0133a0f9850f2e0655a6888ade711e60961eb27eb850739184bb4df6e1f80dbb3448ee20214e9966e79ac18e6079b438850773f811999431e9a0dc8d52c +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 metadata.xml 1456 SHA256 d106fe0b2c0065842dba18c09e7197e6929e3f828fc438b598ae43adfa93d97b SHA512 e52b4e877e4136940bb86c7097aa68943aff48a53ee87bf0e447f8219c5831bdcce503eaf5bfec01ac3cc637a3f1fcfe693130e077d24bc96c63a0456bd8e36a WHIRLPOOL 37a64b4b88e3d51bc0265c02a8e17c0831d3d32facb7b4308c8bf00d1d4d3413b43ea10e982af6b6d837c4f7afb89c92947e51dc2bf664f4422310765d9b45d2 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 -iJwEAQEIAAYFAlW5EfkACgkQG9wOWsQutdb67AP/T1/Wl4H4Cu+Ws0RTSBcMe3dB -OC/JSwYgZbJh9iaYRiLoYVpo5I4Egou75qRs3zxlveWCQWrSvNeUaR3MrJE0GYla -Cs7JUnh2jDWCGvfG6lh49lUDdd9h5L/wekwGXYvpEtEmryuTn3DFUjO6Ku8EibFs -RpAEWVuVEQEuUy/YXjM= -=sNjd +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 -----END PGP SIGNATURE----- diff --git a/sys-cluster/neutron/neutron-2015.1.1.ebuild b/sys-cluster/neutron/neutron-2015.1.1.ebuild new file mode 100644 index 000000000000..120d0b7c1a76 --- /dev/null +++ b/sys-cluster/neutron/neutron-2015.1.1.ebuild @@ -0,0 +1,252 @@ +# 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-2015.1.1.ebuild,v 1.1 2015/07/29 23:45:24 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}/kilo/${PV}/+download/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="compute-only dhcp doc l3 metadata openvswitch linuxbridge server test sqlite mysql postgres" +REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) ) + compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server + || ( openvswitch linuxbridge ) )" + +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.10.0[${PYTHON_USEDEP}] + <dev-python/hacking-0.11[${PYTHON_USEDEP}] + >=dev-python/cliff-1.10.0[${PYTHON_USEDEP}] + <dev-python/cliff-1.11.0[${PYTHON_USEDEP}] + >=dev-python/coverage-3.6[${PYTHON_USEDEP}] + >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] + <dev-python/fixtures-1.3.0[${PYTHON_USEDEP}] + >=dev-python/mock-1.0[${PYTHON_USEDEP}] + <dev-python/mock-1.1.0[${PYTHON_USEDEP}] + >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] + >=dev-python/requests-mock-0.6.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.5.0[${PYTHON_USEDEP}] + <dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}] + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}] + !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}] + >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] + >=dev-python/webtest-2.0[${PYTHON_USEDEP}] + >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}] + <dev-python/oslotest-1.6.0[${PYTHON_USEDEP}] + >=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}] + <dev-python/tempest-lib-0.5.0[${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/eventlet-0.16.1[${PYTHON_USEDEP}] + !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}] + >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] + >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] + >=dev-python/requests-2.2.0[${PYTHON_USEDEP}] + !~dev-python/requests-2.4.0[${PYTHON_USEDEP}] + dev-python/jsonrpclib[${PYTHON_USEDEP}] + >=dev-python/jinja-2.6[${PYTHON_USEDEP}] + >=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}] + <dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}] + >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}] + >=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}] + <dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}] + >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] + !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] + compute-only? ( + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[${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-1.2.0[${PYTHON_USEDEP}] + <dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}] + >=dev-python/alembic-0.7.2[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] + >=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}] + <dev-python/stevedore-1.4.0[${PYTHON_USEDEP}] + >=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}] + <dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}] + >=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}] + <dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}] + >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}] + <dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}] + >=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}] + <dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}] + >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}] + <dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}] + >=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}] + <dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}] + >=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}] + <dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}] + >=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}] + <dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}] + >=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}] + <dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}] + >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}] + <dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}] + >=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}] + <dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}] + >=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}] + <dev-python/python-novaclient-2.24.0[${PYTHON_USEDEP}] + dev-python/pyudev[${PYTHON_USEDEP}] + sys-apps/iproute2 + net-misc/bridge-utils + net-firewall/ipset + net-firewall/iptables + net-firewall/ebtables + openvswitch? ( net-misc/openvswitch ) + dhcp? ( net-dns/dnsmasq[dhcp-tools] )" + +PATCHES=( + +) + +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" + + insopts -m 0644 + 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 +} + +pkg_postinst() { + elog + elog "neutron-server's conf.d file may need updating to include additional ini files" + elog "We currently assume the ml2 plugin will be used but do not make assumptions" + elog "on if you will use openvswitch or linuxbridge (or something else)" + elog + elog "Other conf.d files may need updating too, but should be good for the default use case" + elog +} diff --git a/sys-cluster/neutron/neutron-2015.1.9999.ebuild b/sys-cluster/neutron/neutron-2015.1.9999.ebuild index 026d073eeee1..c5cf482c50cd 100644 --- a/sys-cluster/neutron/neutron-2015.1.9999.ebuild +++ b/sys-cluster/neutron/neutron-2015.1.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-2015.1.9999.ebuild,v 1.6 2015/05/17 23:25:00 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2015.1.9999.ebuild,v 1.7 2015/07/29 23:45:24 prometheanfire Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -33,7 +33,9 @@ DEPEND=" <dev-python/cliff-1.11.0[${PYTHON_USEDEP}] >=dev-python/coverage-3.6[${PYTHON_USEDEP}] >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] + <dev-python/fixtures-1.3.0[${PYTHON_USEDEP}] >=dev-python/mock-1.0[${PYTHON_USEDEP}] + <dev-python/mock-1.1.0[${PYTHON_USEDEP}] >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}] >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] @@ -49,6 +51,7 @@ DEPEND=" >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}] <dev-python/oslotest-1.6.0[${PYTHON_USEDEP}] >=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}] + <dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}] )" RDEPEND=" @@ -68,7 +71,7 @@ RDEPEND=" <dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}] >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}] >=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}] - <dev-python/python-neutronclient-3.5.0[${PYTHON_USEDEP}] + <dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}] >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] compute-only? ( @@ -90,7 +93,7 @@ RDEPEND=" <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] ) >=dev-python/webob-1.2.3[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}] + >=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}] <dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}] >=dev-python/alembic-0.7.2[${PYTHON_USEDEP}] >=dev-python/six-1.9.0[${PYTHON_USEDEP}] @@ -130,6 +133,7 @@ RDEPEND=" dhcp? ( net-dns/dnsmasq[dhcp-tools] )" PATCHES=( + ) pkg_setup() { |