commit: 44af581d9047638f67f4b728f18c74e4e4d7be1f Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> AuthorDate: Sun Sep 26 19:31:15 2021 +0000 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> CommitDate: Sun Sep 26 19:31:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=44af581d
sys-cluster/neutron: unkeyword Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> sys-cluster/neutron/Manifest | 3 - sys-cluster/neutron/neutron-17.1.1.ebuild | 227 ------------------------------ sys-cluster/neutron/neutron-17.1.2.ebuild | 2 +- 3 files changed, 1 insertion(+), 231 deletions(-) diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest index 8d94c3474..540f994cd 100644 --- a/sys-cluster/neutron/Manifest +++ b/sys-cluster/neutron/Manifest @@ -1,6 +1,3 @@ -DIST neutron-17.1.1.tar.gz 12925243 BLAKE2B f95068d1a85a508e447fc5de28ef6555252fdfe3deb8b0dd94a2e20f28663dc610bbb5e32fb69e0d80fbe9917c387b0c095fb43370ddfe2bbb05327553cb8e58 SHA512 cd707d4adaa6a6b606940370606fcef61a35af0d1f1108f24891d2f88611f4f2812c061d3b7a9540d4b6df882615a9366d39273184a791a911775e7c9f4402b8 DIST neutron-17.1.2.tar.gz 12930231 BLAKE2B 865e849fb811b3abf8b589ea5752c9305962ed24bcd69a4998425a1d56abcadd87f224e883269b780655f252d40dd050805782080385d94163b5488ffbdbf52a SHA512 1320c96ba5b3b2de5feb313b564baa7308b3b964c628afa57e60ed8f541549b11ddaa0ea1e4025dc0265ad1d962f0961fdc93924fcdde98c9b7c3c23728a3ebd -DIST neutron-configs-17.1.1.tar.gz 30314 BLAKE2B 885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6 SHA512 cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b DIST neutron-configs-17.1.2.tar.gz 30314 BLAKE2B 885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6 SHA512 cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b -DIST neutron-ml2-plugins-17.1.1.tar.gz 9011 BLAKE2B d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931 SHA512 a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37 DIST neutron-ml2-plugins-17.1.2.tar.gz 9011 BLAKE2B d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931 SHA512 a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37 diff --git a/sys-cluster/neutron/neutron-17.1.1.ebuild b/sys-cluster/neutron/neutron-17.1.1.ebuild deleted file mode 100644 index 2f8c49829..000000000 --- a/sys-cluster/neutron/neutron-17.1.1.ebuild +++ /dev/null @@ -1,227 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_8 ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -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/victoria/configs.tar.gz -> neutron-configs-${PV}.tar.gz - https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz" - EGIT_REPO_URI="https://github.com/openstack/neutron.git"; - EGIT_BRANCH="stable/victoria" -else - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/configs.tar.gz -> neutron-configs-${PV}.tar.gz - https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/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 ) )" - -DEPEND=" - >=dev-python/pbr-4.0.0[${PYTHON_USEDEP}] - app-admin/sudo -" -RDEPEND=" - >=dev-python/pbr-4.0.0[${PYTHON_USEDEP}] - >=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.21.0[${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.6.0[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}] - >=dev-python/tenacity-6.0.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/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.20.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-4.2.1[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-7.0.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-2.3.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-2.25.0[${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-4.4.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.3.0[${PYTHON_USEDEP}] - >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}] - >=dev-python/pyroute2-0.5.13[${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-17.1.2.ebuild b/sys-cluster/neutron/neutron-17.1.2.ebuild index 2f8c49829..7e45de295 100644 --- a/sys-cluster/neutron/neutron-17.1.2.ebuild +++ b/sys-cluster/neutron/neutron-17.1.2.ebuild @@ -19,7 +19,7 @@ else SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/configs.tar.gz -> neutron-configs-${PV}.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz https://tarballs.openstack.org/${PN}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64" fi LICENSE="Apache-2.0"
