clean up liberty openstack

2 files changed, 0 insertions, 313 deletions

diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 3b1a8059757e..84dc4975537f 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -1,4 +1,3 @@
-DIST liberty-nova.conf.sample 134201 SHA256 32752212c571c4a1473c3fa8bbd197a658ee54e233b4d46a157807be42997e42 SHA512 5325a31a0fccb9898bec0a022f5430dcc1729615c8eac88a4261c403f9ecd8ce2b07d73b52f3bc2c5cbe681234b30b923adb94385aac28e08d982a8f8bfef350 WHIRLPOOL 6d2894160a96742551777ce397b67f332c4f2793402f4634a2cfd0005ba99fb077cf0d0306a59e4b8c7f689914860e5d7f45d838c845d6a896a66c24f0f141c0
 DIST mitaka-nova.conf.sample 36427 SHA256 dd4c3ccab89fbe9f69df520f47d439c7ffa440d3f8b288b0ab99ac328a02ec75 SHA512 169671bde5cb5bb89065d801f80aa0d3c664af652d9ddb0c409ed3e0af2c0b94f1dbd0ebf834849e3e75dc38972935ec65a6e533d86148a7315839597d577cad WHIRLPOOL 20f95a296c3d112a532c9c5cc911d30b67472868d94bcfd52fadfd7105f9095a6b77020ca1caa6a70319548239358868d809feed363a82e4d574aceb6e5f016d
 DIST nova-13.1.0.tar.gz 5461429 SHA256 2c44b0f015f48348d768abff0e0fc90c6f8faf46743cae94736d77704f249368 SHA512 f16ce0248b86a19688500b97c364fe264919a900f0182f68c900a8e68b06bb22d688be597d5b3d7e8e38753cedaa732360972412508f3ecfea950394a526c6c5 WHIRLPOOL f5d46a1166524d5ad79574f5f63ecc99a6a42865d2280d33a66103d2a88fb26e9c54c8a9ec85901970effd1aed89c42e33ce70a7e900cf642b9c90bfdc4bc52d
 DIST nova-13.1.1.tar.gz 5407219 SHA256 1af74830f52deb24ca0f25acf150c2338a414ccd2082bbb31092d55d28a92a9d SHA512 18866a1fb9e1e94b91b27d72318401de755255be3b3fd374f156ccf88c84697a8f54b6f5be17842f55b5ff323f19d778213925dbeb4ae9c02225d2b3fb56b3cc WHIRLPOOL d5bd05f773b49cf309f02ea34c7d5cbbd82078a17a7aadc66ebd1ed9dd8180a036f31d74d27ea6f1af644eaa873e0e955a52b44ee66448ea93e0507561055d50
diff --git a/sys-cluster/nova/nova-2015.2.9999.ebuild b/sys-cluster/nova/nova-2015.2.9999.ebuild
deleted file mode 100644
index 04eabbeaed86..000000000000
--- a/sys-cluster/nova/nova-2015.2.9999.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils git-r3 linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
-HOMEPAGE="https://launchpad.net/nova"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/nova/liberty/nova.conf.sample -> liberty-nova.conf.sample"
-EGIT_REPO_URI="https://github.com/openstack/nova.git"
-EGIT_BRANCH="stable/liberty"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite test"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-# need to package dev-python/sphinxcontrib-seqdiag
-DEPEND="
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo
-	test? (
-		${RDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		<=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		<=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		<=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		<=dev-python/mox3-0.12.0[${PYTHON_USEDEP}]
-		>=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
-		<=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
-		<=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
-		~dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/python-ironicclient-0.8.0[${PYTHON_USEDEP}]
-		<=dev-python/python-ironicclient-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		<=dev-python/subunit-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		<=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/pillow-2.4.0[${PYTHON_USEDEP}]
-		<dev-python/pillow-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		<=dev-python/oslotest-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
-		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		<=dev-python/testresources-1.0.0-r9999[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		<=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-		<=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
-		<=dev-python/bandit-0.16.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-vmware-0.16.0[${PYTHON_USEDEP}]
-		<=dev-python/oslo-vmware-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
-	)"
-
-# barbicanclient is in here for doc generation
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-	)
-	>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-	<=dev-python/boto-2.38.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	<=dev-python/decorator-4.0.6[${PYTHON_USEDEP}]
-	~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
-	<=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
-	<=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	<=dev-python/lxml-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	<=dev-python/cryptography-1.1.2-r9999[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	<=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	<=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
-	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	<=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	~dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
-	<=dev-python/paramiko-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	<=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	<=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-2.5.1-r9999[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.3.1[${PYTHON_USEDEP}]
-	<=dev-python/python-cinderclient-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	<=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
-	<=dev-python/python-neutronclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
-	<=dev-python/python-glanceclient-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
-	<=dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	<=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	<=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.6.1[${PYTHON_USEDEP}]
-	<=dev-python/websockify-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-log-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.1.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-reports-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-	<=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-rootwrap-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.2.0[${PYTHON_USEDEP}]
-	<=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-middleware-3.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-middleware-3.2.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-	<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-versionedobjects-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
-	<=dev-python/alembic-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-0.4.0[${PYTHON_USEDEP}]
-	<=dev-python/os-brick-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/libvirt-python-1.3.4[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( <=net-misc/openvswitch-2.5.9999 )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? ( net-misc/memcached
-	<=dev-python/python-memcached-1.57 )
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrkit
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.872-r3
-	)"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	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
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "failed testsuite under python2.7"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	if use !compute-only; then
-		for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${FILESDIR}/etc.liberty/api-paste.ini" "api-paste.ini"
-	newins "${FILESDIR}/etc.liberty/cells.json" "cells.json"
-	newins "${FILESDIR}/etc.liberty/logging_sample.conf" "logging_sample.conf"
-	newins "${DISTDIR}/liberty-nova.conf.sample" "nova.conf.sample"
-	newins "${FILESDIR}/etc.liberty/policy.json" "policy.json"
-	newins "${FILESDIR}/etc.liberty/rootwrap.conf" "rootwrap.conf"
-	#rootwrap filters
-	insinto /etc/nova/rootwrap.d
-	newins "${FILESDIR}/etc.liberty/rootwrap.d/api-metadata.filters" "api-metadata.filters"
-	newins "${FILESDIR}/etc.liberty/rootwrap.d/compute.filters" "compute.filters"
-	newins "${FILESDIR}/etc.liberty/rootwrap.d/network.filters" "network.filters"
-	#copy migration conf file (not coppied on install via setup.py script)
-	insopts -m 0644
-	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-	#copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA files failed"
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}