vadimk 14/05/11 13:03:17 Modified: metadata.xml ChangeLog Added: neutron-2014.1-r1.ebuild Log: slot conflicts, bug 508002, new init scripts. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key E1DF22D5)
Revision Changes Path 1.4 sys-cluster/neutron/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/metadata.xml?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/metadata.xml?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/metadata.xml?r1=1.3&r2=1.4 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-cluster/neutron/metadata.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- metadata.xml 22 Nov 2013 04:38:40 -0000 1.3 +++ metadata.xml 11 May 2014 13:03:16 -0000 1.4 @@ -16,9 +16,10 @@ </longdescription> <use> <flag name="dhcp">Installs the initscripts for the neutron dhcp service</flag> - <flag name="l3">Installs the initscripts for the neutron l3 service</flag> - <flag name="metadata">Installs the initscripts for the neutron metadata service</flag> - <flag name="openvswitch">Installs the initscripts for the neutron openvswitch service</flag> + <flag name="l3">Installs the initscripts for the neutron l3 agent service</flag> + <flag name="metadata">Installs the initscripts for the neutron metadata agent service</flag> + <flag name="openvswitch">Installs the initscripts for the neutron openvswitch agent service</flag> + <flag name="linuxbridge">Installs the initscripts for the neutron linuxbridge agent service</flag> <flag name="server">Installs the initscripts for the neutron server service</flag> </use> </pkgmetadata> 1.30 sys-cluster/neutron/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/ChangeLog?rev=1.30&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/ChangeLog?rev=1.30&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/ChangeLog?r1=1.29&r2=1.30 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ChangeLog 28 Apr 2014 02:59:13 -0000 1.29 +++ ChangeLog 11 May 2014 13:03:16 -0000 1.30 @@ -1,6 +1,16 @@ # ChangeLog for sys-cluster/neutron # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.29 2014/04/28 02:59:13 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.30 2014/05/11 13:03:16 vadimk Exp $ + +*neutron-2014.1-r1 (11 May 2014) + + 11 May 2014; Vadim Kuznetsov [email protected] + +files/neutron-dhcp-agent.confd, +files/neutron-l3-agent.confd, + +files/neutron-linuxbridge-agent.confd, +files/neutron-metadata-agent.confd, + +files/neutron-openvswitch-agent.confd, +files/neutron-ovs-cleanup.confd, + +files/neutron-server.confd, +files/neutron.initd, +files/neutron.sudoersd, + +neutron-2014.1-r1.ebuild, metadata.xml: + slot conflicts, bug 508002, new init scripts. *neutron-2014.1.9999 (28 Apr 2014) *neutron-2014.1 (28 Apr 2014) 1.1 sys-cluster/neutron/neutron-2014.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-2014.1-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-2014.1-r1.ebuild?rev=1.1&content-type=text/plain Index: neutron-2014.1-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.1-r1.ebuild,v 1.1 2014/05/11 13:03:16 vadimk Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 user DESCRIPTION="A virtual network service for Openstack." HOMEPAGE="https://launchpad.net/neutron"; SRC_URI="http://launchpad.net/${PN}/icehouse/${PV}/+download/${P}.tar.gz"; LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="dhcp doc l3 metadata openvswitch linuxbridge server test sqlite mysql postgres" REQUIRED_USE="|| ( mysql postgres sqlite )" #the cliff dep is as below because it depends on pyparsing, which only has 2.7 OR 3.2, not both DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/pbr-0.6[${PYTHON_USEDEP}] <dev-python/pbr-1.0[${PYTHON_USEDEP}] app-admin/sudo test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}] <dev-python/hacking-0.9[${PYTHON_USEDEP}] >=dev-python/cliff-1.4.3[${PYTHON_USEDEP}] >=dev-python/coverage-3.6[${PYTHON_USEDEP}] >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] >=dev-python/mock-1.0[${PYTHON_USEDEP}] >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] <dev-python/sphinx-1.2[${PYTHON_USEDEP}] >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] >=dev-python/webtest-2.0[${PYTHON_USEDEP}] dev-python/configobj[${PYTHON_USEDEP}] )" RDEPEND="dev-python/paste[${PYTHON_USEDEP}] >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] >=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}] >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}] virtual/python-argparse[${PYTHON_USEDEP}] >=dev-python/Babel-1.3[${PYTHON_USEDEP}] >=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}] >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] >=dev-python/requests-1.1[${PYTHON_USEDEP}] >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}] dev-python/jsonrpclib[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}] >=dev-python/kombu-2.4.8[${PYTHON_USEDEP}] >=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}] >=dev-python/python-neutronclient-2.3.4[${PYTHON_USEDEP}] <=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-0.7.8[${PYTHON_USEDEP}] <dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] ) sqlite? ( dev-db/sqlite ) >=dev-python/webob-1.2.3[${PYTHON_USEDEP}] >=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}] >=dev-python/alembic-0.4.1[${PYTHON_USEDEP}] >=dev-python/six-1.5.2[${PYTHON_USEDEP}] >=dev-python/stevedore-0.14[${PYTHON_USEDEP}] >=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}] dev-python/oslo-rootwrap[${PYTHON_USEDEP}] >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] dev-python/pyudev[${PYTHON_USEDEP}] sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) dhcp? ( net-dns/dnsmasq[dhcp-tools] )" PATCHES=( "${FILESDIR}/sphinx_mapping.patch" ) pkg_setup() { enewgroup neutron enewuser neutron -1 -1 /var/lib/neutron neutron } pkg_config() { fperms 0700 /var/log/neutron fowners neutron:neutron /var/log neutron } src_prepare() { #it's /bin/ip not /sbin/ip sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* distutils-r1_src_prepare } python_compile_all() { use doc && make -C doc html } python_test() { # https://bugs.launchpad.net/neutron/+bug/1234857 # https://bugs.launchpad.net/swift/+bug/1249727 # https://bugs.launchpad.net/neutron/+bug/1251657 # turn multiprocessing off, testr will use it --parallel local DISTUTILS_NO_PARALLEL_BUILD=1 # Move tests out that attempt net connection, have failures mv $(find . -name test_ovs_tunnel.py) . || die sed -e 's:test_app_using_ipv6_and_ssl:_&:' \ -e 's:test_start_random_port_with_ipv6:_&:' \ -i neutron/tests/unit/test_wsgi.py || die testr init testr run --parallel || die "failed testsuite under python2.7" } python_install() { distutils-r1_python_install if use server; then newinitd "${FILESDIR}/neutron.initd" "neutron-server" newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" dosym /etc/neutron/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/neutron.conf" doins "etc/api-paste.ini" doins "etc/dhcp_agent.ini" doins "etc/fwaas_driver.ini" doins "etc/l3_agent.ini" doins "etc/lbaas_agent.ini" doins "etc/metadata_agent.ini" doins "etc/metering_agent.ini" doins "etc/policy.json" doins "etc/vpn_agent.ini" doins -r "etc/neutron/plugins" insopts -m 0640 -o root -g root doins "etc/rootwrap.conf" doins -r "etc/neutron/rootwrap.d" insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/" doins -r "neutron/db/migration/alembic_migrations/versions" #add sudoers definitions for user neutron insinto /etc/sudoers.d/ insopts -m 0440 -o root -g root newins "${FILESDIR}/neutron.sudoersd" neutron #remove superfluous stuff rm -R "${D}/usr/etc/" } python_install_all() { use doc && local HTML_DOCS=( doc/build/html/. ) distutils-r1_python_install_all }
