added compute-only use flag

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

5 files changed, 38 insertions, 27 deletions

diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index 248416daf784..5b3d7da2521b 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,13 @@
 # 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.91 2015/05/12 04:47:09 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.92 2015/05/12 05:06:11 prometheanfire Exp $
+
+*nova-2015.1.0-r1 (12 May 2015)
+
+  12 May 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +nova-2015.1.0-r1.ebuild, -nova-2015.1.0.ebuild, metadata.xml,
+  nova-2015.1.9999.ebuild:
+  added compute-only use flag
 
   12 May 2015; Matthew Thode <prometheanfire@gentoo.org> nova-2015.1.0.ebuild,
   nova-2015.1.9999.ebuild:
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index f8ffb86c2194..efa3c5ebfd7e 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -6,23 +6,23 @@ AUX nova.initd 627 SHA256 74417e422e6c503ae338bb981934b54a5da57e783bdfed778de6ce
 DIST nova-2014.2.3.tar.gz 4436742 SHA256 5fc1f02c887a4ca9b1968dba71864cdb5e81bfbee3da398c64260be0cf1d7a2b SHA512 320ff0b3d6257834b96629101b0c1d6c4b240004dc8f9775759aa6532d166c8849bc3feef04e001421a75f36bd3516b8df0b595af30d020c3d9c22af843c5099 WHIRLPOOL 653c2485f89df171c03e290ce6cbc61c0a964d64440a0de9ebfda24dec6abac4e1c633d0a0057d7e531590e5bc9d3f048a0fe8b89c8db22007ef72ec24e3ebf7
 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.ebuild 6872 SHA256 f89785a76db0cb2a53c24f918e5ab81025ae65cb301b29766efa77caa2a5f831 SHA512 41d75780d62da0a83eeb10a8a6a2b490a510d93d7590216c08ee89c67764a7bc54b4ed7d498459fd3140a743afa790a6dd003c7bbce2f0fd079185ea41b6e8e4 WHIRLPOOL b7c574a5a8580ea7d420db2e9d0eeadec9b194c085b36ebecf9a3b102ee35a3aaecc3fcd2bbe571fd79e81d8e862dd02a95666670095569f9f231cbd7d474cec
-EBUILD nova-2015.1.9999.ebuild 6869 SHA256 586284161dcd6c76cc26c6fd8fb26e6e0156f5b066e39744936e2f552ca5a565 SHA512 1606fffd67b691da48767688bf327c9c99dc5b27689b34e9037c205812f2bb8abc0ab1c384b91153c5a4bcde18366ff3ea0e6c11c02d4a4e90b3414269e76b69 WHIRLPOOL 6cc9a1f5d99fdc9890c959c26aae35a84cb5fc30628a6797083bd441b5d119ed142cc3374885a185cf1570a637a44ac6b37e952c111577f54c00f94f1020ee11
-MISC ChangeLog 19769 SHA256 af994fc5e17ad9a015138157f30dd42f78ca3a0434022fe3a697f6b1f7647dfc SHA512 6c8aac6031978b8e0f525faba12f59091dbb8c696ef13f88a56495aa0cc5b27db35d6ecb6cb8f93e8c492d5233697727cb5bbb5606999a2e7a743376fee3c9ab WHIRLPOOL 5595ab1c9f1806d1f5c32024497a617eff203d7f150e4482ee46a915a29460daff0a013edd1c3ff2ac08f25a7af2a859eba0d12848d27ff9e416fe7deb66810e
-MISC metadata.xml 911 SHA256 d5ba172160431f66d7d3bfa414209ef83b9e449efd3a55ded6d6ab91b3adeece SHA512 eb2c13ad92930a0792580d276672c7e9aae07ae09109bb6149429dff5e24951509ea95fa182ebdbb8a9a94b5dcbf6b25b580a16878c9b201ffa840270919d30e WHIRLPOOL 0a0eb3e24dade3fb862a89ad92a3da54191fa3bca682a8a512410c5f376d575ef21703cdcb085e7a423b89e8c08bdb682ef53392c43f19fdb0f6fd4984bfd0ce
+EBUILD nova-2015.1.0-r1.ebuild 6955 SHA256 082c65456633d480879b8bdc7f4a27589c63fef96fec713037b08b17e7b1f4df SHA512 54e0d4436e8fa5e352da9a277fd014101090f29a3b6901d0385f0980e28d368df50d7175098b54a6f813ae85103ae86d4e36e54076f980e9284a5fff055e7b35 WHIRLPOOL b243b566955c374ea27bfb0f66e94249349bec1c8141f556b758ba8947930f37111da30a7e7d0eeb37183fe1608f7226d0c576557bf577a8bb998578f6efe2f6
+EBUILD nova-2015.1.9999.ebuild 6950 SHA256 4556bef3a2b3b193dbc6d4d7f926aa9c3d579ab060488eeddd1c591426da88b6 SHA512 f073a5b8cd58f28b364ab70010290a163e52db3bcfde2eb33533d62fb376c61ed2cbf9a05107967b0cecb3d4a2ace9b7cd595cace78f2b068282b777280ef178 WHIRLPOOL 48b142c350fa2198192e13547c2661919d1bf5280c08e923f3ffef6d5c2172bb6e11b3c9fb556752ed6be5eea3678504d304108c26431ba27278e178fc161ef2
+MISC ChangeLog 19982 SHA256 03212e6eb56eb79aee7fd212b7de70a9f6874dd4b345a91de6f2ac51c7e6e19f SHA512 4d611fbdd7664fb44ef7d79145d38ebabb6d78199abf66f11a39774f55757ce25738dec5a90be0d4208535235b584b7634626acaa16c682a847e49fc2efeb856 WHIRLPOOL f8790467cd40330836ff5e84572af951f0444ffb1e0dbb21baac7b6825aaa8b9579b94c6176c5e3aae57d8c8b7fbef97e41e0121945579f660388c3a7fd1e145
+MISC metadata.xml 1051 SHA256 e99ea9caf3ec3a6003b9006526f2f5b9f24ac5b1c0a11885da0f26d065687fff SHA512 69cbde4ecedadad05a1f575d9cc63f8321a41cc1222517e2497880b072c1f2f734b87549de5c8c28ab490fecd3eea78e7efca90f8a4e417179fcbe9505b73ed7 WHIRLPOOL 39a982e144c029ba2f4a4aa937afb4aca00d87769f92b953847113fed20bef0788830285fb2b56d44076ca779844059d5728cc49ce273ccf900043137d88387b
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBCAAGBQJVUYXUAAoJEGSje+quGaTosIgQAJm27iGP80Ya1ZpmPEp9nxRA
-ekjcBPrT9lu36g8gAf7MnZ/pCOpUS5yyRVBdVdGhoUfvcN6jxXWoecELOUCdiZU4
-Tqa9+gPvi+8XxVjSLiY212D+bRRNY7s55z3jLw4QaNzV2RC/2XlTVNjU/ED4CJZr
-LRKc6BVmjOzqKixm3FHOFGO30mMS5fWUB5pFaZ/IeOFiW3C/0v//+SuEAGUkQaO8
-h6AXTq2Y69ybrV+r31I06sDQZtbhol7gXauh9XiYziqN2rXwnHIrZ9g2YwIgXQMB
-of0OP+u2ZQR//0vlwNGP3mavy5Fj4dNz7vbgHMdxjAje3FvHj9Rs4R+Wdx18wZHC
-616EYi4ur80r9OhorACj8ZoOeR1kJzpSJz1q3M49224puvQZrz+P3IlRC9X0ddMw
-0y59Dgr7B4lu5xba+pmylq1zQDe+obWM+bm7vcrhv9GQzNIg9S3vi59cii9W2rtD
-cqj9X7K1+fYFcazzXs7cVjxrxtaK34J5wX21bEuJpmXAQjkjhZ5oXlNjKfGk9b0g
-hvHYVt6yLXDQyHR6KLgfXewH8HKmEtZwrRgGFDn/VwM9JaaB6ciSqVBULB5kgzrv
-YiELfxi2nB5YnvjaB9MxBcejDHk4HeW6lRmkq+HRnVhSzlNzsbWsuAA9lHyt3HPV
-fbn/b5MH7PGaj7ZTuiqt
-=HDNz
+iQIcBAEBCAAGBQJVUYpKAAoJEGSje+quGaTo58sP/0a4jJLIHthwwoEZYFZJURzV
+ZQ9afiUQ0r9Q1FCldXAv0gwzZ3PzH4tkgWXibSYfqu1Or4ibwdlNntqI+/3L+sbE
+/jdhdau6y6OZyQX+dzDvmlK9dnKFKk+p6AS+DjaHv9pvLWhEvUzm6rsIAZMypzlb
+c2tT4J6n++QD4on017a5NfBhlRSXfkcjFDGco4OvZiMH+XG/PAzOoGL7mD9cJspo
+are0a9njDkPodGQD/lueuG8Hs2R9WGDtyEEwJZMJxABDxi1F9OWyAuWNHZR0inG+
+HK/UCHYQcphtMMILGNtDGprLHE2oPaFtP+infhWYSUHtjWgty7K/dpv5U6fuYQLk
+4u8YIRS2X7f5Q5zgl3thJ3R94z6I7+yWiG8WYcsNDthsGY+TbsFaqYnLTvJ22mMO
+cLRIeUQyPm9HmVagXjl3FWZDWCNAprtN4pA2FYbZcJVVBp99P42nesk8xFbjEEUA
+E0+AgvRBmRfYTzm/MOR4Q9L0G2ecYc4+4W9q9DoszTaLmfFrtZdgv38ko72/YQNU
+GsvVaUwLmAk7qU4hlndVvLkb1GyqJBQ5SeeJxEdx+htcwBpgGIpnKBtdNVaxyNAC
+vYEMthRXwzcgi+nmTMEpJSCMw1HNB9nrpZQ8HzeZ1FafVH57B49CAfGPNAfZBncJ
+eHJhhi0AO3vd0Cn2oQVe
+=qILJ
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/metadata.xml b/sys-cluster/nova/metadata.xml
index 55d0694c1363..a29a00994cca 100644
--- a/sys-cluster/nova/metadata.xml
+++ b/sys-cluster/nova/metadata.xml
@@ -12,10 +12,12 @@
   </longdescription>
   <use>
     <flag name="compute">Installs the initscripts for the nova volume service</flag>
+		<flag name="compute-only">only install stuff needed for a compute host</flag>
     <flag name="kvm">qemu-kvm hypervisor support</flag>
     <flag name="network">Installs the initscripts for the nova network service</flag>
     <flag name="novncproxy">Installs the initscripts for the nova novncproxy service</flag>
     <flag name="openvswitch">Installs openvswitch for the neutron openvswitch support</flag>
+		<flag name="rabbitmq">Installs the rabbitmq server</flag>
     <flag name="xen">xen hypervisor support</flag>
   </use>
 </pkgmetadata>
diff --git a/sys-cluster/nova/nova-2015.1.0.ebuild b/sys-cluster/nova/nova-2015.1.0-r1.ebuild
index 9b8473d8d055..3293c8a19800 100644
--- a/sys-cluster/nova/nova-2015.1.0.ebuild
+++ b/sys-cluster/nova/nova-2015.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.5 2015/05/12 04:47:09 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.0-r1.ebuild,v 1.1 2015/05/12 05:06:11 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,9 +15,10 @@ EGIT_BRANCH="stable/kilo"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+compute +kvm +network +novncproxy openvswitch sqlite mysql postgres xen"
+IUSE="+compute compute-only +kvm +novncproxy openvswitch +rabbitmq sqlite mysql postgres xen"
 REQUIRED_USE="|| ( mysql postgres sqlite )
-			  compute? ( || ( kvm xen ) )"
+				compute-only? ( compute !novncproxy !rabbitmq )
+			  compute? ( ^^ ( kvm xen ) )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
@@ -104,7 +105,7 @@ RDEPEND="
 	novncproxy? ( www-apps/novnc )
 	sys-apps/iproute2
 	openvswitch? ( net-misc/openvswitch )
-	net-misc/rabbitmq-server
+	rabbitmq? ( net-misc/rabbitmq-server )
 	sys-fs/sysfsutils
 	sys-fs/multipath-tools
 	net-misc/bridge-utils
diff --git a/sys-cluster/nova/nova-2015.1.9999.ebuild b/sys-cluster/nova/nova-2015.1.9999.ebuild
index dd2850309549..ac58a748c90e 100644
--- a/sys-cluster/nova/nova-2015.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2015.1.9999.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2015/05/12 04:47:09 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild,v 1.6 2015/05/12 05:06:11 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,9 +15,10 @@ EGIT_BRANCH="stable/kilo"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+compute +kvm +network +novncproxy openvswitch sqlite mysql postgres xen"
+IUSE="+compute compute-only +kvm +novncproxy openvswitch +rabbitmq sqlite mysql postgres xen"
 REQUIRED_USE="|| ( mysql postgres sqlite )
-			  compute? ( || ( kvm xen ) )"
+				compute-only? ( compute !novncproxy !rabbitmq )
+			  compute? ( ^^ ( kvm xen ) )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
@@ -104,7 +105,7 @@ RDEPEND="
 	novncproxy? ( www-apps/novnc )
 	sys-apps/iproute2
 	openvswitch? ( net-misc/openvswitch )
-	net-misc/rabbitmq-server
+	rabbitmq? ( net-misc/rabbitmq-server )
 	sys-fs/sysfsutils
 	sys-fs/multipath-tools
 	net-misc/bridge-utils
@@ -164,7 +165,7 @@ python_install() {
 	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 644
+	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)