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