bup and adding testing to nova

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

4 files changed, 315 insertions, 16 deletions

diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index 0bcfd01a37fc..93f0b029ab72 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/nova
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.102 2015/07/29 17:56:28 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.103 2015/07/30 00:34:25 prometheanfire Exp $
+
+*nova-2015.1.1 (30 Jul 2015)
+
+  30 Jul 2015; Matthew Thode <prometheanfire@gentoo.org> +nova-2015.1.1.ebuild,
+  nova-2015.1.9999.ebuild:
+  bup and adding testing to nova
 
   29 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> nova-2015.1.0-r3.ebuild:
   x86 stable wrt bug #554284
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 7c1a31b1cb72..21ccf55d7295 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -7,18 +7,27 @@ AUX openstack-scsi-disk.rules 134 SHA256 929cfecc3eae1142ac45923f1de06876af9db7f
 AUX scsi-openscsi-link.sh 2777 SHA256 4ea97b8b7121092245ae108faf488beb2b11113407eb2b478ff8ee79a87b8290 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409 WHIRLPOOL 636fff1abe0e8934dde986e9c8f51bc4a4284d57db9efe4b0090479df7516817bbfdc3e3da2fd35d19c80b095bddbcc2f31b1cd54be8d204a62df6da973279f0
 DIST nova-2014.2.3.tar.gz 4436742 SHA256 5fc1f02c887a4ca9b1968dba71864cdb5e81bfbee3da398c64260be0cf1d7a2b SHA512 320ff0b3d6257834b96629101b0c1d6c4b240004dc8f9775759aa6532d166c8849bc3feef04e001421a75f36bd3516b8df0b595af30d020c3d9c22af843c5099 WHIRLPOOL 653c2485f89df171c03e290ce6cbc61c0a964d64440a0de9ebfda24dec6abac4e1c633d0a0057d7e531590e5bc9d3f048a0fe8b89c8db22007ef72ec24e3ebf7
 DIST nova-2015.1.0.tar.gz 4541653 SHA256 7279d18cee6f13e19443f7cdc6a296566674d66049ee5c9af6d1c973115f16d7 SHA512 a315f7bbb73de4f26645ffed42663af377ab5cd55db82eedbcc1411208e276bc5dc68c2ccef07a35943f6643f3862ca44a9b51f8e259322bb176c74485d98cc5 WHIRLPOOL d885527d6479cd1c760b6291732c5a7e01b472f536d4b2a55cd4b829f32e4d4b213d946870b4e52c47a86973c7d97fd89ebaed752256e5286c91222973c68824
+DIST nova-2015.1.1.tar.gz 4544374 SHA256 d9b480827995727f2ccc06e4b5709e689e8a466006e07157ce92bc9d074e197e SHA512 7aad21fc59143cd4acab4a97980aafa9b1216789a0206c0d3098f5d96257e40baa77ef45696982648cc82a7f988f40525621da402871eeb398b21699932cea64 WHIRLPOOL 08b94f93be1e5821cfaaa835f33af2ddc23e75cea3dc6f1ca82be80317db95abd38dda336cca212cd68111fa65ca8c53c62f684e07acd2c1906e8d4cfc989905
 EBUILD nova-2014.2.3.ebuild 6067 SHA256 b8ea6d84e8bfbf5c5658b10938d4da15b8dfbb9044b4b4b475ebeb3a89a75793 SHA512 38188b2c1e0eed1fe23002ccfaa81f6782b74276b587b21765f83b359ae67f8757e6222b0bc2c1d819f238c2c943c1ebf5fdab5da1b0bb1de08934b04ba16550 WHIRLPOOL 2db61b4f347a886465b29c02901d9ec3ea7f34e0abb49be18e754269032a7aa932221f918d905a1add52d28672d0e28629dd7d55213fec71ba45b318b4edd5e3
 EBUILD nova-2014.2.9999.ebuild 6075 SHA256 eefe8729db7296ca360cddabfde23258be0a908921d94ab25ea585e199ddf9b1 SHA512 6ebfc8afdcfb33aaccf0bc137360c563572c743d3fb937e18805eba5d13f9a6c027311917327a519ee71492070875528d58fff3f1747b35e1f0031f973decf68 WHIRLPOOL 989b23c9d9edd618c6338731b5763f2a258de2241830e934bfbc26f38f105b61206934ee78188eb760fa47f63f1f65b9df8bf7e2279eb3596d8a99089f74f322
 EBUILD nova-2015.1.0-r3.ebuild 7529 SHA256 cd068842b85dd96aaa7a02a9db01d55b8e27cb5d3205ec3e47242fa4a3b3b2dc SHA512 f1eb7fd5ccc97635d2465d98b97278f33a22d7db0ab46d5523a89df751f64766e109a8e766a29bee54fb6729c2d2488692c8bc91a14484e0e95ee115f5baf41c WHIRLPOOL 7f5d57c8ca6d6d5ae880f942bb22a1e6eb72930c69d1514626cdce0bc800743421e3bf24352ea7eef4494d17baf75048b44b3602a60c128f047a6af6e2a3e1d0
-EBUILD nova-2015.1.9999.ebuild 7549 SHA256 57b7e2c832ec498d25aa0c3ed7599151332cb072598b1f4bbe6cf282e524e758 SHA512 d4e16941ee91513ad8f16ab0059a66fee00e8502862df293c1ea7bde7aae7e579f898ab55b3a051c3f19fa7994a704f5329d2f5b26fce6feba54dde031fee329 WHIRLPOOL 8e8fe4c2133f544a8fa0001ba18a0abbd281295ebad5c5ae8ac0f4b2370a38f04c6bfead09343bbca67c6a9e9329c90f71085034aa94dda12a48eed4179d0a2f
-MISC ChangeLog 21527 SHA256 ac9ec6ab58d39b35098fd9d3f03ded74b28c2dc744d95650a5cd6924223783e0 SHA512 ca98f240b739639b0201937a88bc47d77c9d8ca9aac05745ab4641b624b8f6c18d79d935334f4d69a0a851eb282ba0704be8cd1b664c168fc54c074db8205f76 WHIRLPOOL fba3964a0ac51f1562bbd33f96ddd5a6f5d7d632021e71e9b98586acc69f0e2c60275539a4b7c6d11c8f4bb6033248cd21a6e5990d2ca81a9efb5e3e96167163
+EBUILD nova-2015.1.1.ebuild 9271 SHA256 1216f7e09f60c23ef3d82cf6acad971dee1a9d6e0aa5e9e2f3e97a5819da1eac SHA512 d60a694f1277078ac71559491727709cd24731a75f8f3ea63e505ab2074af3d8f7b8cb9ef08d8cf03ff87ed569119781d16a459d7d2dd2c95c76be79fe253056 WHIRLPOOL bf5ba4d71ee401cfcfcada8800d4a5f4560c8e7449603f90743c474621a832016c09aa20d932a8a9a9abb9c3ad4c9d142278b13e0065b42700aebab682b933da
+EBUILD nova-2015.1.9999.ebuild 9280 SHA256 4a8a029c0cee90af4987acce85d5db78a0867ea9ecad4c38a44209ddb4f8c930 SHA512 d5d6ae002ab281b0d983ec464ee0b3e541cff82e91670efaf5fdb6dea2dad708e9aec88e8cb028e19484563723761624601c8024d7473d493417663ac91f8319 WHIRLPOOL bb49d552fddfd49ddaa4bc74e4c0450f947bf3a7ae189f1470f6204dab36aa6245b685b07f8095fcb297c67e52c538cd8f8d9b6fb22e26c767e66ed277f974d3
+MISC ChangeLog 21705 SHA256 431ad907d6c9d6bf6478b34d0bc4175d7391c5399d24b19575c6ae6fb9c52018 SHA512 8ba063ba878a8570b4bd691b09053d517e2279b0d1284b3ecd3fe8e71126db40a78146165256b7c00c3b3fcab0a1908b15829b494ba82789d6a9719ff1580877 WHIRLPOOL 9432c50b9cc1e3c3e991669bccc17be462f3c18e8e5696447ca2a7e78f01e5467d5b473cc42bc0fbe2f6f495fa72e75d3f82d082156d3bf4c79510e0c6abb9b9
 MISC metadata.xml 1260 SHA256 b4e820c6064dc85b039f587e24ad6441fcf4a8df51bd685a04ef103bd1acac70 SHA512 6c30aa50013f98f183ab0ef0b72bde4f5eb5c3bffa22495bd97526ccdd30430cb43b3507722a42b7b7ab168d0ca4b7a61d7ce72196a39075162958c54f8b9230 WHIRLPOOL 4005218d2273faec31d520404d636887ae8248686398b8676efe721232e4d923d5b58ed4978a27059adb14d73d3985e3e8d04a12a4f7a29444f18e8aa15b862b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
 
-iJwEAQEIAAYFAlW5E0AACgkQG9wOWsQutdbrYwQAoOBsdo6oluHUKjs+ryuGg5mo
-/SgRzrITCGttRiC9ltV8DVItDKF5vuA4MiS2c0oW5sNkvvHbQY+oOi37aC9NrcGo
-vom0tMTWTs3210aGVh2lcrDLvYnjL5m2YefIdXHR/ox/6p5JIBN6MjnYpmw7cWfW
-kD5wCS0MLxSGehM4Yeo=
-=hLjN
+iQIcBAEBCAAGBQJVuXFfAAoJEGSje+quGaTomDYP/RtVy6qDTH9G1wxGuAlPA9bz
+henfwpQR4a2TQ0U9IGI+AGRXJ4/uhRgQ5QtZblSTMHYaQm7kZnQ2QQLYoaIfFHjC
+t92Bx3OchsnTNtDwhu3SjKuulX1KcB71h4ByGSW7m8sUwjpfS9SzuSLtMNxuKdRT
+879idRNkVPbFLgnbUcnnfgbJ2tU6N8h6rejJw5n8HOceOYmP42KdzxhE2Joc3aK5
+bbtyG3LplQWOEF3LKM+vM/NQi+fNb7Q1mj/gWUEt2yO/b8Le13cYeBg7LURxZ+Zv
+fxM+BBH33m3RaxOvsWAasjgvvqH96UvX01ahi18/jEz7/PgoJrxWNbX7UZUDs7Yi
+Z+b2e+9F66p4NpVdUILsjeYGCyo3pz+VWlB/Uqb4hiQTjj6hqHaWOWllG4odAy1Q
+ZV/oJuU4XP8pgmDaeatxuMxsDZ8enrmA9+Js4E36sbl40yIG2qWmbtogdzI5Qy5u
+erfjhWdEXy2bCzmhXh0Ay+ILj7hKate1rtXb09igSZxpBKsu2IYmNKpqCfH42xKB
+xxuY0nQ1v4kgjl8p7qsfIjipTEfXgrUEZnxRAeRVyPXmCSjMz6IUn6j6YBdmWT1E
+FwI3YVOhPACIkPzBeLjbrTEcqhakEyajYGhMVBjt5KZr2Z8Njyjf8lWQy2O1TFb/
+/JWaZsmkd0Wb2V8n4LLk
+=h1y9
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/nova-2015.1.1.ebuild b/sys-cluster/nova/nova-2015.1.1.ebuild
new file mode 100644
index 000000000000..82ebf25871e6
--- /dev/null
+++ b/sys-cluster/nova/nova-2015.1.1.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.1.ebuild,v 1.1 2015/07/30 00:34:25 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info multilib user
+
+DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python"
+HOMEPAGE="https://launchpad.net/nova"
+SRC_URI="http://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite test xen"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+						compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
+						compute? ( ^^ ( kvm xen ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	app-admin/sudo
+	test? (
+		${RDEPEND}
+		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		dev-python/mysql-python[${PYTHON_USEDEP}]
+		dev-python/psycopg[${PYTHON_USEDEP}]
+		>=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
+		<dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
+		>=dev-python/python-ironicclient-0.4.1[${PYTHON_USEDEP}]
+		<dev-python/python-ironicclient-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.6.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/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
+		<dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
+		<dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
+	)"
+
+# barbicanclient is in here for doc generation
+RDEPEND="
+	compute-only? (
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	~dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-1.1.0[${PYTHON_USEDEP}]
+	<dev-python/python-cinderclient-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}]
+	<dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-0.15.0[${PYTHON_USEDEP}]
+	<dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
+	<dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/websockify-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+	<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( net-misc/openvswitch )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? ( net-misc/memcached )
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrkit
+		kvm? ( app-emulation/qemu )
+		xen? ( app-emulation/xen
+			   app-emulation/xen-tools )
+	)
+	iscsi? (
+		sys-fs/lsscsi
+	)"
+
+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() {
+	distutils-r1_python_prepare
+	sed -i 's/python/python2\.7/g' tools/config/generate_sample.sh || die
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	./tools/config/generate_sample.sh -b ./ -p nova -o etc/nova || die
+}
+
+python_test() {
+	# turn multiprocessing off, testr will use it --parallel
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	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 "etc/nova/nova.conf.sample" "nova.conf"
+	doins "etc/nova/api-paste.ini"
+	doins "etc/nova/logging_sample.conf"
+	doins "etc/nova/policy.json"
+	doins "etc/nova/rootwrap.conf"
+	#rootwrap filters
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/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
+}
diff --git a/sys-cluster/nova/nova-2015.1.9999.ebuild b/sys-cluster/nova/nova-2015.1.9999.ebuild
index 7c78430ebaf1..460b87b551ec 100644
--- a/sys-cluster/nova/nova-2015.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2015.1.9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild,v 1.13 2015/06/17 21:10:37 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild,v 1.14 2015/07/30 00:34:25 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 eutils git-2 linux-info multilib udev user
+inherit distutils-r1 eutils git-2 linux-info multilib user
 
 DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python"
 HOMEPAGE="https://launchpad.net/nova"
@@ -15,15 +15,50 @@ EGIT_BRANCH="stable/kilo"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+compute compute-only +kvm +memcached +novncproxy openvswitch +rabbitmq sqlite mysql postgres xen iscsi"
+IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite test xen"
 REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
 						compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
 						compute? ( ^^ ( kvm xen ) )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		app-admin/sudo"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	app-admin/sudo
+	test? (
+		${RDEPEND}
+		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		dev-python/mysql-python[${PYTHON_USEDEP}]
+		dev-python/psycopg[${PYTHON_USEDEP}]
+		>=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
+		<dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
+		>=dev-python/python-ironicclient-0.4.1[${PYTHON_USEDEP}]
+		<dev-python/python-ironicclient-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.6.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/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
+		<dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
+		<dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
+	)"
 
 # barbicanclient is in here for doc generation
 RDEPEND="
@@ -152,6 +187,13 @@ python_compile() {
 	./tools/config/generate_sample.sh -b ./ -p nova -o etc/nova || die
 }
 
+python_test() {
+	# turn multiprocessing off, testr will use it --parallel
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
 python_install() {
 	distutils-r1_python_install