From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1210259-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8D8C7138359
for <garchives@archives.gentoo.org>; Sun, 27 Sep 2020 21:06:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 56823E080E;
Sun, 27 Sep 2020 21:06:47 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id EDD85E07FA
for <gentoo-commits@lists.gentoo.org>; Sun, 27 Sep 2020 21:06:46 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 82B04335DC8
for <gentoo-commits@lists.gentoo.org>; Sun, 27 Sep 2020 21:06:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id EF05B339
for <gentoo-commits@lists.gentoo.org>; Sun, 27 Sep 2020 21:06:43 +0000 (UTC)
From: "Matthew Thode" <prometheanfire@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" <prometheanfire@gentoo.org>
Message-ID: <1601240791.9fc8b0a1e4cd370d2be61af5f6adc5e69b862163.prometheanfire@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/neutron/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-cluster/neutron/Manifest sys-cluster/neutron/neutron-16.0.0.ebuild sys-cluster/neutron/neutron-16.1.0.ebuild
X-VCS-Directories: sys-cluster/neutron/
X-VCS-Committer: prometheanfire
X-VCS-Committer-Name: Matthew Thode
X-VCS-Revision: 9fc8b0a1e4cd370d2be61af5f6adc5e69b862163
X-VCS-Branch: master
Date: Sun, 27 Sep 2020 21:06:43 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c207da99-4440-49f3-bb39-4b2e08f8ceef
X-Archives-Hash: de520b51c2644bb82bf344c8a031089f
commit: 9fc8b0a1e4cd370d2be61af5f6adc5e69b862163
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 27 20:59:45 2020 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 21:06:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fc8b0a1
sys-cluster/neutron: 16.1.0 stable amd64/x86 with cleanup
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
sys-cluster/neutron/Manifest | 3 -
sys-cluster/neutron/neutron-16.0.0.ebuild | 232 ------------------------------
sys-cluster/neutron/neutron-16.1.0.ebuild | 2 +-
3 files changed, 1 insertion(+), 236 deletions(-)
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 1a07ff42151..f1146210c51 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1,8 +1,5 @@
-DIST neutron-16.0.0.tar.gz 12746070 BLAKE2B 659ae3bc6971393522dc98ee5b4eccddd85aae17571734f24571e13892376ad2d9a25c09224e703a5b89511c2d696b69842469789649a1f239115ad2422af951 SHA512 f2c23a04d75328b8a671ac65163e6f84cd48880864331f6713793a037a23043779656cfdbe4aab6772fb4e5f5c606db9d97f3d4f3dc8f234920381a9929778cc
DIST neutron-16.1.0.tar.gz 12757452 BLAKE2B 0561d2ed30c525dd5c9bc8502636714cd67680cb3f8d1d8bd04caa03ad50e0bf3f7578563789fc7172f6a53847c039a5e1e1fc12a0b5268b29077c83853c146f SHA512 13f5a58aeff8df85771737615706db67885baa1c115be01854a6e917bdf13415e201f971bd03fd3558f975c579c165c3b8079d6c7ee50588948b511d02d13b9f
-DIST neutron-configs-16.0.0.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
DIST neutron-configs-16.1.0.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
DIST neutron-configs-2020.1.9999.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
-DIST neutron-ml2-plugins-16.0.0.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
DIST neutron-ml2-plugins-16.1.0.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
DIST neutron-ml2-plugins-2020.1.9999.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
diff --git a/sys-cluster/neutron/neutron-16.0.0.ebuild b/sys-cluster/neutron/neutron-16.0.0.ebuild
deleted file mode 100644
index e33cb97dad0..00000000000
--- a/sys-cluster/neutron/neutron-16.0.0.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
-
-inherit distutils-r1 linux-info
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-if [[ ${PV} == *9999 ]];then
- inherit git-r3
- SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
- https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
- EGIT_REPO_URI="https://github.com/openstack/neutron.git"
- EGIT_BRANCH="stable/ussuri"
-else
- SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
- https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
- https://tarballs.openstack.org/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
- compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
- || ( openvswitch linuxbridge ) )"
-
-CDEPEND=">=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
- app-admin/sudo"
-
-RDEPEND="
- ${CDEPEND}
- >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
- >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
- >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
- >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
- >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
- >=dev-python/pecan-1.3.2[${PYTHON_USEDEP}]
- >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.10[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
- >=dev-python/neutron-lib-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
- >=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}]
- compute-only? (
- >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
- )
- sqlite? (
- >=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
- )
- mysql? (
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
- !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
- )
- postgres? (
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
- )
- >=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
- >=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
- >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
- >=dev-python/oslo-db-4.37.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
- >=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
- >=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
- >=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
- >=dev-python/ovsdbapp-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
- >=dev-python/pyroute2-0.5.7[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
- >=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
- >=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
- >=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
- >=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
- >=dev-python/os-vif-1.15.1[${PYTHON_USEDEP}]
- >=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
- dev-python/pyudev[${PYTHON_USEDEP}]
- sys-apps/iproute2
- net-misc/iputils[arping]
- net-misc/bridge-utils
- net-firewall/ipset
- net-firewall/iptables
- net-firewall/ebtables
- net-firewall/conntrack-tools
- haproxy? ( net-proxy/haproxy )
- openvswitch? ( net-misc/openvswitch )
- ipv6? (
- net-misc/radvd
- >=net-misc/dibbler-1.0.1
- )
- dhcp? ( net-dns/dnsmasq[dhcp-tools] )
- acct-group/neutron
- acct-user/neutron"
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
- 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_DEFRAG_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
-}
-
-pkg_config() {
- fperms 0700 /var/log/neutron
- fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
- sed -i '/^hacking/d' test-requirements.txt || die
- # it's /bin/ip not /sbin/ip
- sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- if use server; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-server"
- newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
- dosym ../../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
- 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"
-
- #add sudoers definitions for user neutron
- insinto /etc/sudoers.d/
- insopts -m 0440 -o root -g root
- newins "${FILESDIR}/neutron.sudoersd" neutron
-
- # add generated configs
- cd "${D}/etc/neutron" || die
- unpack "neutron-configs-${PV}.tar.gz"
- cd "${D}/etc/neutron/plugins/ml2" || die
- unpack "neutron-ml2-plugins-${PV}.tar.gz"
-
- # correcting perms
- fowners neutron:neutron -R "/etc/neutron"
- fperms o-rwx -R "/etc/neutron/"
-
- #remove superfluous stuff
- rm -R "${D}/usr/etc/"
-}
-
-python_install() {
- distutils-r1_python_install
- # copy migration conf file (not coppied on install via setup.py script)
- python_moduleinto neutron/db/migration/alembic_migrations
- python_domodule "neutron/db/migration/alembic_migrations/versions"
-}
-
-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-16.1.0.ebuild b/sys-cluster/neutron/neutron-16.1.0.ebuild
index b8a3ed95df9..e33cb97dad0 100644
--- a/sys-cluster/neutron/neutron-16.1.0.ebuild
+++ b/sys-cluster/neutron/neutron-16.1.0.ebuild
@@ -19,7 +19,7 @@ else
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
https://tarballs.openstack.org/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 x86"
fi
LICENSE="Apache-2.0"