Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/neutron/
Date: Sat, 27 Jun 2020 22:57:55
Message-Id: 1593298666.e632966d938a389db49743ef70d64242c9c75359.prometheanfire@gentoo
1 commit: e632966d938a389db49743ef70d64242c9c75359
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 27 22:57:21 2020 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 27 22:57:46 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e632966d
7
8 sys-cluster/neutron: 15.1.0 stable amd64 / x86 with cleanup
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.23
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 sys-cluster/neutron/Manifest | 3 -
14 sys-cluster/neutron/neutron-15.0.2.ebuild | 229 ------------------------------
15 sys-cluster/neutron/neutron-15.1.0.ebuild | 2 +-
16 3 files changed, 1 insertion(+), 233 deletions(-)
17
18 diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
19 index 0523d004e7a..6e0b4af34a3 100644
20 --- a/sys-cluster/neutron/Manifest
21 +++ b/sys-cluster/neutron/Manifest
22 @@ -1,12 +1,9 @@
23 -DIST neutron-15.0.2.tar.gz 10523237 BLAKE2B d900a95286549ede403a988b206315cee911c0dfde198101c2961a39f3059ed2121352ca0d232eac2a8deacb55344de3073b821312d40156331064b8aa00add8 SHA512 36a2adcbecf7b168a4a8141bae29453bc8122e3400bff9987d2cfe40728896a0a55040c2fd7d98ecade27162e49bbd0918be712940a0c2b7b31984d0677d1dbe
24 DIST neutron-15.1.0.tar.gz 10549248 BLAKE2B f9e4dff7c8ae1568187284c2676a67a572902a67ccf08998dcc0620938e6a15320a69297771c9686dd19c93f4363c7193e1b9f3763ef7423c62a85df6ec155b6 SHA512 89d737c52fd098fab13bfe6548d9a723bfcf4c97e2f6669915d07efe55d5e707ab19ea1af8fa7c328b9426998cc835c5ddb619799949efb1a9291d0654ea7b1e
25 DIST neutron-16.0.0.tar.gz 12746070 BLAKE2B 659ae3bc6971393522dc98ee5b4eccddd85aae17571734f24571e13892376ad2d9a25c09224e703a5b89511c2d696b69842469789649a1f239115ad2422af951 SHA512 f2c23a04d75328b8a671ac65163e6f84cd48880864331f6713793a037a23043779656cfdbe4aab6772fb4e5f5c606db9d97f3d4f3dc8f234920381a9929778cc
26 -DIST neutron-configs-15.0.2.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe
27 DIST neutron-configs-15.1.0.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe
28 DIST neutron-configs-16.0.0.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
29 DIST neutron-configs-2019.2.9999.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe
30 DIST neutron-configs-2020.1.9999.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
31 -DIST neutron-ml2-plugins-15.0.2.tar.gz 8669 BLAKE2B 3c34a857c0e7dd4e5313f5f9a1bb22384aeae6d1e43e719c50eab8dc3e842e98f202eb12cbb788127603931292deeed802f0592bad232e6a05121939e3b26fe0 SHA512 0e6858425ee3d3e2233c8ebf19aa8e62b5ff849532a2fdceb953f384f3b33432137537afbb2878f23ec5eb57e185eda36a6d6ff71d8be5f32b43abcb5c186082
32 DIST neutron-ml2-plugins-15.1.0.tar.gz 8669 BLAKE2B 3c34a857c0e7dd4e5313f5f9a1bb22384aeae6d1e43e719c50eab8dc3e842e98f202eb12cbb788127603931292deeed802f0592bad232e6a05121939e3b26fe0 SHA512 0e6858425ee3d3e2233c8ebf19aa8e62b5ff849532a2fdceb953f384f3b33432137537afbb2878f23ec5eb57e185eda36a6d6ff71d8be5f32b43abcb5c186082
33 DIST neutron-ml2-plugins-16.0.0.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
34 DIST neutron-ml2-plugins-2019.2.9999.tar.gz 8669 BLAKE2B 3c34a857c0e7dd4e5313f5f9a1bb22384aeae6d1e43e719c50eab8dc3e842e98f202eb12cbb788127603931292deeed802f0592bad232e6a05121939e3b26fe0 SHA512 0e6858425ee3d3e2233c8ebf19aa8e62b5ff849532a2fdceb953f384f3b33432137537afbb2878f23ec5eb57e185eda36a6d6ff71d8be5f32b43abcb5c186082
35
36 diff --git a/sys-cluster/neutron/neutron-15.0.2.ebuild b/sys-cluster/neutron/neutron-15.0.2.ebuild
37 deleted file mode 100644
38 index 5deaec79742..00000000000
39 --- a/sys-cluster/neutron/neutron-15.0.2.ebuild
40 +++ /dev/null
41 @@ -1,229 +0,0 @@
42 -# Copyright 1999-2020 Gentoo Authors
43 -# Distributed under the terms of the GNU General Public License v2
44 -
45 -EAPI=7
46 -PYTHON_COMPAT=( python3_{6,7} )
47 -# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
48 -
49 -inherit distutils-r1 linux-info
50 -
51 -DESCRIPTION="A virtual network service for Openstack"
52 -HOMEPAGE="https://launchpad.net/neutron"
53 -if [[ ${PV} == *9999 ]];then
54 - inherit git-r3
55 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/configs.tar.gz -> neutron-configs-${PV}.tar.gz
56 - https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
57 - EGIT_REPO_URI="https://github.com/openstack/neutron.git"
58 - EGIT_BRANCH="stable/train"
59 -else
60 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/configs.tar.gz -> neutron-configs-${PV}.tar.gz
61 - https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
62 - https://tarballs.openstack.org/${PN}/${P}.tar.gz"
63 - KEYWORDS="amd64 ~arm64 x86"
64 -fi
65 -
66 -LICENSE="Apache-2.0"
67 -SLOT="0"
68 -IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres"
69 -REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
70 - compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
71 - || ( openvswitch linuxbridge ) )"
72 -
73 -CDEPEND=">=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]"
74 -DEPEND="
75 - dev-python/setuptools[${PYTHON_USEDEP}]
76 - ${CDEPEND}
77 - app-admin/sudo"
78 -
79 -RDEPEND="
80 - ${CDEPEND}
81 - >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
82 - >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
83 - >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
84 - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
85 - >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
86 - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
87 - !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
88 - >=dev-python/pecan-1.3.2[${PYTHON_USEDEP}]
89 - >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
90 - >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
91 - >=dev-python/jinja-2.10[${PYTHON_USEDEP}]
92 - >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
93 - >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
94 - >=dev-python/neutron-lib-1.29.1[${PYTHON_USEDEP}]
95 - >=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
96 - >=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
97 - compute-only? (
98 - >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
99 - )
100 - sqlite? (
101 - >=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
102 - )
103 - mysql? (
104 - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
105 - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
106 - >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
107 - )
108 - postgres? (
109 - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
110 - >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
111 - )
112 - >=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
113 - >=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
114 - >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
115 - >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
116 - >=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
117 - >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
118 - >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
119 - >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
120 - >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
121 - >=dev-python/oslo-db-4.37.0[${PYTHON_USEDEP}]
122 - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
123 - >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
124 - >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
125 - >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
126 - >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
127 - >=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
128 - >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
129 - >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
130 - >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
131 - !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
132 - >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
133 - !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
134 - >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
135 - >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
136 - >=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
137 - >=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
138 - >=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
139 - >=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
140 - >=dev-python/ovsdbapp-0.9.1[${PYTHON_USEDEP}]
141 - >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
142 - >=dev-python/pyroute2-0.5.3[${PYTHON_USEDEP}]
143 - >=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
144 - >=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
145 - >=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
146 - >=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
147 - >=dev-python/os-vif-1.15.1[${PYTHON_USEDEP}]
148 - dev-python/pyudev[${PYTHON_USEDEP}]
149 - sys-apps/iproute2
150 - net-misc/iputils[arping]
151 - net-misc/bridge-utils
152 - net-firewall/ipset
153 - net-firewall/iptables
154 - net-firewall/ebtables
155 - net-firewall/conntrack-tools
156 - haproxy? ( net-proxy/haproxy )
157 - openvswitch? ( net-misc/openvswitch )
158 - ipv6? (
159 - net-misc/radvd
160 - >=net-misc/dibbler-1.0.1
161 - )
162 - dhcp? ( net-dns/dnsmasq[dhcp-tools] )
163 - acct-group/neutron
164 - acct-user/neutron"
165 -
166 -#PATCHES=(
167 -#)
168 -
169 -pkg_pretend() {
170 - linux-info_pkg_setup
171 - CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
172 - IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
173 - NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
174 - if linux_config_exists; then
175 - for module in ${CONFIG_CHECK_MODULES}; do
176 - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
177 - done
178 - fi
179 -}
180 -
181 -pkg_config() {
182 - fperms 0700 /var/log/neutron
183 - fowners neutron:neutron /var/log neutron
184 -}
185 -
186 -src_prepare() {
187 - sed -i '/^hacking/d' test-requirements.txt || die
188 - # it's /bin/ip not /sbin/ip
189 - sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
190 - distutils-r1_python_prepare_all
191 -}
192 -
193 -python_install_all() {
194 - distutils-r1_python_install_all
195 - if use server; then
196 - newinitd "${FILESDIR}/neutron.initd" "neutron-server"
197 - newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
198 - dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
199 - fi
200 - if use dhcp; then
201 - newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
202 - newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
203 - fi
204 - if use l3; then
205 - newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
206 - newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
207 - fi
208 - if use metadata; then
209 - newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
210 - newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
211 - fi
212 - if use openvswitch; then
213 - newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
214 - newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
215 - newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
216 - newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
217 - fi
218 - if use linuxbridge; then
219 - newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
220 - newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
221 - fi
222 - diropts -m 755 -o neutron -g neutron
223 - dodir /var/log/neutron /var/lib/neutron
224 - keepdir /etc/neutron
225 - insinto /etc/neutron
226 - insopts -m 0640 -o neutron -g neutron
227 -
228 - doins etc/*
229 - # stupid renames
230 - insinto /etc/neutron
231 - doins -r "etc/neutron/plugins"
232 - insopts -m 0640 -o root -g root
233 - doins "etc/rootwrap.conf"
234 - doins -r "etc/neutron/rootwrap.d"
235 -
236 - #add sudoers definitions for user neutron
237 - insinto /etc/sudoers.d/
238 - insopts -m 0440 -o root -g root
239 - newins "${FILESDIR}/neutron.sudoersd" neutron
240 -
241 - # add generated configs
242 - cd "${D}/etc/neutron" || die
243 - unpack "neutron-configs-${PV}.tar.gz"
244 - cd "${D}/etc/neutron/plugins/ml2" || die
245 - unpack "neutron-ml2-plugins-${PV}.tar.gz"
246 -
247 - # correcting perms
248 - fowners neutron:neutron -R "/etc/neutron"
249 - fperms o-rwx -R "/etc/neutron/"
250 -
251 - #remove superfluous stuff
252 - rm -R "${D}/usr/etc/"
253 -}
254 -
255 -python_install() {
256 - distutils-r1_python_install
257 - # copy migration conf file (not coppied on install via setup.py script)
258 - python_moduleinto neutron/db/migration/alembic_migrations
259 - python_domodule "neutron/db/migration/alembic_migrations/versions"
260 -}
261 -
262 -pkg_postinst() {
263 - elog
264 - elog "neutron-server's conf.d file may need updating to include additional ini files"
265 - elog "We currently assume the ml2 plugin will be used but do not make assumptions"
266 - elog "on if you will use openvswitch or linuxbridge (or something else)"
267 - elog
268 - elog "Other conf.d files may need updating too, but should be good for the default use case"
269 - elog
270 -}
271
272 diff --git a/sys-cluster/neutron/neutron-15.1.0.ebuild b/sys-cluster/neutron/neutron-15.1.0.ebuild
273 index 518d9465fd1..5deaec79742 100644
274 --- a/sys-cluster/neutron/neutron-15.1.0.ebuild
275 +++ b/sys-cluster/neutron/neutron-15.1.0.ebuild
276 @@ -19,7 +19,7 @@ else
277 SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/configs.tar.gz -> neutron-configs-${PV}.tar.gz
278 https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
279 https://tarballs.openstack.org/${PN}/${P}.tar.gz"
280 - KEYWORDS="~amd64 ~arm64 ~x86"
281 + KEYWORDS="amd64 ~arm64 x86"
282 fi
283
284 LICENSE="Apache-2.0"
Report Message
Find on MARC Find on Google Groups