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: Tue, 27 Oct 2020 21:55:10
Message-Id: 1603835697.6e165f1ff03d868d56b3b8c2d7f3289578e36f1b.prometheanfire@gentoo
1 commit: 6e165f1ff03d868d56b3b8c2d7f3289578e36f1b
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 27 21:49:39 2020 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 27 21:54:57 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e165f1f
7
8 sys-cluster/neutron: 16.2.0 stable amd64/x86 with cleanup
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.2
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 sys-cluster/neutron/Manifest | 3 -
14 sys-cluster/neutron/neutron-16.1.0.ebuild | 232 ------------------------------
15 sys-cluster/neutron/neutron-16.2.0.ebuild | 2 +-
16 3 files changed, 1 insertion(+), 236 deletions(-)
17
18 diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
19 index 0b85492c107..4300efd2056 100644
20 --- a/sys-cluster/neutron/Manifest
21 +++ b/sys-cluster/neutron/Manifest
22 @@ -1,12 +1,9 @@
23 -DIST neutron-16.1.0.tar.gz 12757452 BLAKE2B 0561d2ed30c525dd5c9bc8502636714cd67680cb3f8d1d8bd04caa03ad50e0bf3f7578563789fc7172f6a53847c039a5e1e1fc12a0b5268b29077c83853c146f SHA512 13f5a58aeff8df85771737615706db67885baa1c115be01854a6e917bdf13415e201f971bd03fd3558f975c579c165c3b8079d6c7ee50588948b511d02d13b9f
24 DIST neutron-16.2.0.tar.gz 12771467 BLAKE2B d3dbfbffcf7321a195d3cadf0bd4864763f6a1c6c3022ec32d20ffeb1770d522446c78e2bad9c7dc281fdb67b445b3ecbf8908741dd7a42ebc1efde56af642bb SHA512 d5c39296c925af8b69e23a3faf75e99e6d4d2e5b1daf0da7883a75bcce1e41990392aa90499510c7dee552178cb908c1cd80add48ac894015255842d15711641
25 DIST neutron-17.0.0.tar.gz 12801363 BLAKE2B 7297e5832e19f6543bbfdcaed7f4240ed54bb976dc40f0bc90ffbc00e8d5b97b4f194fd9c451f08f7f6c431c66f99562f0fce63456ff66418aad73c3effb3bac SHA512 5a67896376110cdae407c4ba3b758b1b12883c1355e30e927e1c705c6ad3df5126c1555870f7e9b130b35663c5f748f33078c588b3c4b94750f47b5db58b0662
26 -DIST neutron-configs-16.1.0.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
27 DIST neutron-configs-16.2.0.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
28 DIST neutron-configs-17.0.0.tar.gz 30314 BLAKE2B 885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6 SHA512 cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
29 DIST neutron-configs-2020.1.9999.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
30 DIST neutron-configs-2020.2.9999.tar.gz 30314 BLAKE2B 885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6 SHA512 cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
31 -DIST neutron-ml2-plugins-16.1.0.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
32 DIST neutron-ml2-plugins-16.2.0.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
33 DIST neutron-ml2-plugins-17.0.0.tar.gz 9011 BLAKE2B d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931 SHA512 a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37
34 DIST neutron-ml2-plugins-2020.1.9999.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
35
36 diff --git a/sys-cluster/neutron/neutron-16.1.0.ebuild b/sys-cluster/neutron/neutron-16.1.0.ebuild
37 deleted file mode 100644
38 index e33cb97dad0..00000000000
39 --- a/sys-cluster/neutron/neutron-16.1.0.ebuild
40 +++ /dev/null
41 @@ -1,232 +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_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/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
56 - https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
57 - EGIT_REPO_URI="https://github.com/openstack/neutron.git"
58 - EGIT_BRANCH="stable/ussuri"
59 -else
60 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
61 - https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/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.19.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-2.2.0[${PYTHON_USEDEP}]
95 - >=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
96 - >=dev-python/tenacity-4.4.0[${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.14.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-1.0.0[${PYTHON_USEDEP}]
141 - >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
142 - >=dev-python/pyroute2-0.5.7[${PYTHON_USEDEP}]
143 - >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
144 - >=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
145 - >=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
146 - >=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
147 - >=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
148 - >=dev-python/os-vif-1.15.1[${PYTHON_USEDEP}]
149 - >=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
150 - >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
151 - dev-python/pyudev[${PYTHON_USEDEP}]
152 - sys-apps/iproute2
153 - net-misc/iputils[arping]
154 - net-misc/bridge-utils
155 - net-firewall/ipset
156 - net-firewall/iptables
157 - net-firewall/ebtables
158 - net-firewall/conntrack-tools
159 - haproxy? ( net-proxy/haproxy )
160 - openvswitch? ( net-misc/openvswitch )
161 - ipv6? (
162 - net-misc/radvd
163 - >=net-misc/dibbler-1.0.1
164 - )
165 - dhcp? ( net-dns/dnsmasq[dhcp-tools] )
166 - acct-group/neutron
167 - acct-user/neutron"
168 -
169 -#PATCHES=(
170 -#)
171 -
172 -pkg_pretend() {
173 - linux-info_pkg_setup
174 - CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
175 - IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_DEFRAG_IPV4 NF_NAT NF_CONNTRACK \
176 - IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
177 - if linux_config_exists; then
178 - for module in ${CONFIG_CHECK_MODULES}; do
179 - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
180 - done
181 - fi
182 -}
183 -
184 -pkg_config() {
185 - fperms 0700 /var/log/neutron
186 - fowners neutron:neutron /var/log neutron
187 -}
188 -
189 -src_prepare() {
190 - sed -i '/^hacking/d' test-requirements.txt || die
191 - # it's /bin/ip not /sbin/ip
192 - sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
193 - distutils-r1_python_prepare_all
194 -}
195 -
196 -python_install_all() {
197 - distutils-r1_python_install_all
198 - if use server; then
199 - newinitd "${FILESDIR}/neutron.initd" "neutron-server"
200 - newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
201 - dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
202 - fi
203 - if use dhcp; then
204 - newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
205 - newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
206 - fi
207 - if use l3; then
208 - newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
209 - newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
210 - fi
211 - if use metadata; then
212 - newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
213 - newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
214 - fi
215 - if use openvswitch; then
216 - newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
217 - newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
218 - newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
219 - newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
220 - fi
221 - if use linuxbridge; then
222 - newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
223 - newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
224 - fi
225 - diropts -m 755 -o neutron -g neutron
226 - dodir /var/log/neutron /var/lib/neutron
227 - keepdir /etc/neutron
228 - insinto /etc/neutron
229 - insopts -m 0640 -o neutron -g neutron
230 -
231 - doins etc/*
232 - # stupid renames
233 - insinto /etc/neutron
234 - doins -r "etc/neutron/plugins"
235 - insopts -m 0640 -o root -g root
236 - doins "etc/rootwrap.conf"
237 - doins -r "etc/neutron/rootwrap.d"
238 -
239 - #add sudoers definitions for user neutron
240 - insinto /etc/sudoers.d/
241 - insopts -m 0440 -o root -g root
242 - newins "${FILESDIR}/neutron.sudoersd" neutron
243 -
244 - # add generated configs
245 - cd "${D}/etc/neutron" || die
246 - unpack "neutron-configs-${PV}.tar.gz"
247 - cd "${D}/etc/neutron/plugins/ml2" || die
248 - unpack "neutron-ml2-plugins-${PV}.tar.gz"
249 -
250 - # correcting perms
251 - fowners neutron:neutron -R "/etc/neutron"
252 - fperms o-rwx -R "/etc/neutron/"
253 -
254 - #remove superfluous stuff
255 - rm -R "${D}/usr/etc/"
256 -}
257 -
258 -python_install() {
259 - distutils-r1_python_install
260 - # copy migration conf file (not coppied on install via setup.py script)
261 - python_moduleinto neutron/db/migration/alembic_migrations
262 - python_domodule "neutron/db/migration/alembic_migrations/versions"
263 -}
264 -
265 -pkg_postinst() {
266 - elog
267 - elog "neutron-server's conf.d file may need updating to include additional ini files"
268 - elog "We currently assume the ml2 plugin will be used but do not make assumptions"
269 - elog "on if you will use openvswitch or linuxbridge (or something else)"
270 - elog
271 - elog "Other conf.d files may need updating too, but should be good for the default use case"
272 - elog
273 -}
274
275 diff --git a/sys-cluster/neutron/neutron-16.2.0.ebuild b/sys-cluster/neutron/neutron-16.2.0.ebuild
276 index a48cc0a000d..7aa084a661e 100644
277 --- a/sys-cluster/neutron/neutron-16.2.0.ebuild
278 +++ b/sys-cluster/neutron/neutron-16.2.0.ebuild
279 @@ -19,7 +19,7 @@ else
280 SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
281 https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
282 https://tarballs.openstack.org/${PN}/${P}.tar.gz"
283 - KEYWORDS="~amd64 ~arm64 ~x86"
284 + KEYWORDS="amd64 ~arm64 x86"
285 fi
286
287 LICENSE="Apache-2.0"