Gentoo Archives: gentoo-commits

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