update to nova and deps 2013.2.9999

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

5 files changed, 56 insertions, 44 deletions

diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index cd3c58a5ee28..27d67ad0634d 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/nova
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.55 2014/03/30 05:42:20 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.56 2014/04/01 03:46:51 prometheanfire Exp $
+
+  01 Apr 2014; Matthew Thode <prometheanfire@gentoo.org> +files/nova.initd,
+  metadata.xml, nova-2013.2.9999.ebuild:
+  update to nova and deps 2013.2.9999
 
   30 Mar 2014; Matthew Thode <prometheanfire@gentoo.org> metadata.xml,
   nova-2013.2.9999.ebuild:
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index ee197ddf1955..1d074f3a25a4 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -5,29 +5,30 @@ AUX 2013.2.2-CVE-2014-0134.patch 29323 SHA256 dd751e26c0d179603282cbfa8234d60756
 AUX nova-confd 101 SHA256 d9013141618d1e8b8ba85297155747d9c8fc362238de7bba3108b9a2539c8c73 SHA512 4c7ec1d123f2cdaf394d1f4824df861bbe309b0b329db44080160d81746cd0fc9d4cc1b35da0f66ab075f1d4e835ababfb7bccaf4a2e931e60f2c0ac572a552e WHIRLPOOL 6a237357a3905d29a96b32c37f6d189e4f5cefc0986bb091e24a79295191332143741c604c2a9fd44484c75b3be89742a5570862cf0cd4ba225425f7f32b5348
 AUX nova-initd 1496 SHA256 5b5f928335ac345103492555c3bc57407f547915b099762d0087aef172e5edf8 SHA512 cca06baba484d505f3a96643d836204a08e9dde50197531cdab2d95188b992a95a375a386b9c54fcc8e0a4f6167babba975db7510db1087f044afa39effe4eec WHIRLPOOL 4c667a5cc469826063a65879c1beddc98371edf295a273c9b8f679627cabfe2260d8b3bbdf9550d3894fc1525d63b9f98d6e939406f90ac5f2f745daa59311c2
 AUX nova-sudoers 78 SHA256 9e88c2843fb74cc46802c0b103067ad12915ec50335d05e546a5dba76acb4a76 SHA512 22c0606c6335b2d1a03bd18a319a54f16f76f091b2e8416dbba05ce7c15890beff7f32f0322eb5ba3f2a5c750436cacbe0cee189b390b878e3f0c0df219ef984 WHIRLPOOL bc42ae1d12e9f900b263fd5c3d0f59062f46fbec1ff97c0bceb234082bea5943eb64795b4f5e102b8e2749c6868163e5924467088cad42df09345e3406e5f83c
+AUX nova.initd 537 SHA256 523587620208419cc73ea150ad1cc04502a2945e51970c3cae18bbfb1d328ce0 SHA512 c1bce2214e10e41e23d17034126c666d63fca5f7709d5bf93608778aa40d0ec518397151fec029b9be3b9639be66213b619f5a2a30617442ba07aff8335192b7 WHIRLPOOL 600946df334247c381bbf1d87e039e39bf3e2962afd5129a63751cd56ea348c804af50014f62141807e6f0181d74b7313f268834e5146b451b125e60cdb61643
 DIST nova-2013.1.5.tar.gz 5807073 SHA256 8e67f60a385e6fe4818856f0581ae2acf9b9eca1187f3b9a3c298ccbeeda1134 SHA512 d2069b4c84eae9f6185b0918b4b9de3499d660baa8a3345e97355aa31d2c75533ed8a9b52b612c37635242fce354614a95cabaa55c2148fc3c1387b606934a12 WHIRLPOOL 04e8f3e796a7d0d64b251a71087edf228f141c90b9bcab7e40c97019257da4d0f3c21b540ec2faaee1da12c0f6545c19fcaf9cbc9184daf0c386d34198bb5c54
 DIST nova-2013.2.2.tar.gz 6884905 SHA256 203bb5f7b773006bfbc4a946ae00e899896c27a21e73d1e4103bacc55bb83744 SHA512 6a1380204a22535a42c38f21efae8cf306d5d1c34da7997a1c9b3aebaa815c5e16d9cf6626e72575bbba3bba9dc93512ddc43a3f2d5bceac9dd518f409e9f14f WHIRLPOOL c620184e2d67e4ce726011ddcecc17ffdfec0e02934209feff891c3782c389cd9607ec393a9f3edd95905ea1da1ced18b9867e13cbdfed3a59a49d8336ee1e5a
 EBUILD nova-2013.1.5.ebuild 5190 SHA256 ec04a1a65a2c7c066c026eb12ec7670ec9f887288dbec0267023ff7d60eb2b79 SHA512 4ed71335909dcf9d818f65c865a851b668eccca9ea245ef65a306a86dc61c616d78de9a59f1a39e9d0e389d32c667e43cddb006f4f8f3c825aa676f15ba48112 WHIRLPOOL df8230828fb518ca5e0ac6485d0190e14d2e1915d71aaa2812c7d385a3732902c0665f9494cd6d30b61f1cadb4dc893e115ffaccf28c0fa1faefc6873d3a580d
 EBUILD nova-2013.1.9999.ebuild 5070 SHA256 1dd4815b62e7290b24f0a6ebed20b388546d1cc143fc9ee3ecf1fc9a572188c6 SHA512 d75b2d6e7c100b86627f06de5d14b9094b3074f8bf758b5f9195f5fd589bf3bd0fe6a5d0ac9d1b74e604754b905f9e2020c953631da7549156de6b50bb273b09 WHIRLPOOL 83349cd2a1d59d7faef7112d786e223dcc0403664ce763cfb8b793b1ad7fb2d68b33dc1134eafc9cddccfd366815013e578e992080d280d29239e33cfdd12e46
 EBUILD nova-2013.2.2-r1.ebuild 5133 SHA256 88a89a8476c994654563f862d3257e08802c398628c9fa45734524f93c678294 SHA512 130e6a2232255f470054b73b01f09903a329a1bbe9db61e118fa1a77058a3b0bab0e1b5e794831d4be58ccad8d904b8627758a6290fb9c56fa8b48b57054c85e WHIRLPOOL c66627ee4db02a3d1aed1025f427c3e1dd90d4684d03e2a585f5a9886251e414ebb57226202e811652d57edefd8e9fdb26c725aec290cc82356c5386b7446127
-EBUILD nova-2013.2.9999.ebuild 5173 SHA256 65df0c6755a1215d0a515a783f296353e90224ac3a8f7a02f4c775687714297e SHA512 4a4040292b59ffe16daf5caf7ffb0b365422dcd261bfa429b0a30f0767e0c07928f6beb101d51f81ceb9922422a4ce88a103eeda10778b2ad51fe598b8fb5482 WHIRLPOOL 157c4e5b2c62d35e7b0f11f5f8318bae7cb920356270561893f0db62737319b451899894507c90c8833686ab737d1e910aa04e88bce1ef4ef4e7b215066d556c
+EBUILD nova-2013.2.9999.ebuild 4518 SHA256 42627c742512560265a319926890550b727240879a7c72f9202c7622ed1c3631 SHA512 0da6abfdeec6b5c7c79947e2de096b753d2de5f3115faba9c894741975724b59f792e465aedcbd457c5667120f7c8fb5728f510d56ab5955e5af4cf0effb0d7b WHIRLPOOL 9c207b051fc867a11787fa2588ef549ea96e506a15f6d64eff29676b08a917b063e88db524958d5950b8b78253fe937d71ba23ae5beca9919529a9c7aff145ea
 EBUILD nova-9999.ebuild 5225 SHA256 8336956c0a15fd17e15f748c6445c3b144f2a9047dd8257ba3dda7a7b7f1ad01 SHA512 6d961e646096eb4df5814d31b06352f999291becefa5e8fdd88afd14e6ede54e583ba224e474e1122e90b114da4136782cd8336afb467c61fc5400a7dd3a05e8 WHIRLPOOL c4bad3d35be8adb4af48562507ef213185e6d722541226e7d8bedd02578265c035874b371f432db4d1db222fc2776cc74374a508ca562a30dae622a86e0bab10
-MISC ChangeLog 13267 SHA256 3c7bec9b7de79e925eb54bcbbe7516aac7d9d31b7afe9e82ece841d99303ab58 SHA512 07c9e5887fb3796a397b0cff50c4a1f3e40c95647a2863cd1a54eba79e737e4d05665f7b1dd3b0759d5d252c82c076ae80940a92e84d9b78227513d384ff62ce WHIRLPOOL 4dafe19970b2293f3261341912761b16e5cf205dce251705f9e8156cf8bd89a58639c2825efd4c252081729e0ce5fa2927289bacdef0e5e2c9f279a6b329ac78
-MISC metadata.xml 1537 SHA256 9a0ba4f494227a0df14159d3f126c400a0c9a7546edb868e482daf6098eeb480 SHA512 041f60eb738f32bb5ed1d311c0b9aeee7e279266164e6b371bc080060063c7784f2a59cb019d8b8d24f9f8eafb651cd23ff330e065e80716cff3314efce37396 WHIRLPOOL 016ded2142a4f650eb41e3c655e607b16e8c5f747d535b0c94a519c31e03b2e2efd73ec9fee15a4645c480423f728489c77a65bb030ea5c522845cc8d31fab59
+MISC ChangeLog 13423 SHA256 6fc4ab238c0470aa304adaf0ecdbfbfaba0f1d714b8e86993450d47c4cb48d9b SHA512 aa8a13457aab71780a8d1d84fd0f8870861c23f2b5a3b88f9b8a6d372b9d9914bea45bbe8646dbc8c6c22971bc25dfd841bff4097b501b08c48424b80a18b4bc WHIRLPOOL 667dcc737d69cb9a2125cdd2ab9585f847a46750b0be7afa1ad9c48517d9d5c7ecbc069094b036aa741707120b6279f580286979672026a97cd6058551352cfe
+MISC metadata.xml 1452 SHA256 29bf3efaab7a4e45f5e442b26a7606edaed3f47e4ffec3e8990f95aea6bf2450 SHA512 537664b6ff29f4afe09eb4635c2cb06d87a6c3c3101e8ef89d1ab9b5b802c79024e94a0cce5a44ec2fd5b1cc37a251dd42156a015b6a294f219b90daff17c9c1 WHIRLPOOL c6e44f9a48fea6ae2a323e9e03d8805301fb0d94bb5634b1946909715f6c05d45c49180204d00221aae1e6dc6748347b4273fae838216b5d5d07932bc473a851
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTN67vAAoJECRx6z5ArFrDT9oQANllec0ub3IXX/o/tS//+i9d
-LIaZVUXPDYtdL14eJ1iLMnsvs2l6tTxxAqpK8Swaq22e6AE6MXjrovm/nf8ugefw
-AFapMkqBLll+FLEveyRt1zDdanMkjzbruS2D+6pNooLEX3Aug1mWakd7Q+Pq1Hk+
-SdoPh5Q5Ndc2JFFI2cybQEDtY7XMg9tLea6f6M+Ae9/4NEVzOUMiNuqOio9CeWVC
-hbvdHQ2FHS6Mn3wQg3xUSWD4ZX/0fyK1pzyuZ9Tl5JeQy5lKFb4dWaukyIbwq1JN
-olysP4Z9UZ4r865cE0iUzstvABv/cfaPEHhhJvkdMuvg9t+vXnJRFatoUlvGPeq3
-ogfAIeo6cSna8uIG/8OBNDLlOUUEcQNIkI4xOrH4hZ2MHxVbOVfuXn4FzXO7WNs/
-9yqkhhsGChVgiBJ+IXSCZ6ZXSTcqB+zGENL4YEk6zxPjOQuVkE2PL+b0tqIw03F1
-RH3TDcwMgD0YXXXlyovB5cQ3bVD2wgw4eiA1fidMzNTgMCjKyi2o39iSjdyHiTKc
-5urNgLl/d+xpG8lm3y698zM5hafLF5wf5EjNx8yU2j09+92VIZRfAtcS1Srim1qR
-8q5M+0XJKCk6k0QDE5cN/74CqxL6c07pcgn4uQ2uguxWZQDYZm6dTSg/9w3oo/Hm
-O2/P+XuhH3DajF8MdHqq
-=krx/
+iQIcBAEBCAAGBQJTOjbfAAoJECRx6z5ArFrDMcwP/R3VQepaj6ZGMlz/BNcmBL9a
+PCfppJMe3YXDWRrXOPkILjtZ+B1DAm07Rt9OKB2R3n87Te3A/to+JOEDeNZLYXQA
+RJ+3yoEVIzO9lT2oXJtlnZ1sDxNrSWXpGO0WVy72Qa1HyHq1LQDGTHE5xxS+yI9/
+Ahu5j0vosOp33Ij10L52TNNg/cyJ0WjKYrh9nNUeocHOzvYJxuTUphqOmcfg3hzd
+Ghr5dIatw/zwWkD/8A2swjBP+PdLS1tdnIzNxXkxRYXW7FGmOSJ49gvKdVClZjap
+m4WLAfe9/1e8ajEIndO0DLXB9eVute2Y3Xta0EwJliDfbKRuWdEXMAfvvKaGfiqj
+WR5HimjPMs0C+E0Y/9+LIj2XVKGnCfBY/6QKlCSyrDIK4DnXTmEkutQRaz6Xq4NJ
+MF8/Y3D/z5CcBD7Yy+0DjQfU9I9XGwB/aJKM4uZDkpbMk5sev5STQpral5rXmmxk
+LJA7SV4uJyrSyl9sGyGfQKbQalytrLYZA+nd60yqLr8KzOLWZXbmZ4jPul26xe63
+RISdj6LHZtcsMknJ5WDAU3PgkQAT471q23wYv+JBSno80XuLeTM1yej9ENUWWaWW
+n9Yl7isRc2BjYDQHlP8Y3qojKi627X9MumIIl3Wt8lzxDmEhcQK/lUgAmADpHZaP
+bamKP3SdswodaxKtFT2T
+=LBed
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/files/nova.initd b/sys-cluster/nova/files/nova.initd
new file mode 100644
index 000000000000..e1f44f8913aa
--- /dev/null
+++ b/sys-cluster/nova/files/nova.initd
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Starts ${SVCNAME}  service for OpenStack" 
+
+command=/usr/bin/${SVCNAME}
+command_background=yes
+pidfile=/var/run/nova/${SVCNAME}.pid
+required_files=/etc/nova/nova.conf
+start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova}"
+
+depend() {
+    need net 
+    need rabbitmq
+}
+
+start_pre() {
+	checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0664 ${NOVA_RUN:-/var/run/nova}
+}
diff --git a/sys-cluster/nova/metadata.xml b/sys-cluster/nova/metadata.xml
index b30cc7aab287..e0397817f1d3 100644
--- a/sys-cluster/nova/metadata.xml
+++ b/sys-cluster/nova/metadata.xml
@@ -19,7 +19,6 @@
     <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="rabbit">Installs the rabbitmq server as the amqp server for nova</flag>
     <flag name="scheduler">Installs the initscripts for the nova scheduler service</flag>
     <flag name="spicehtml5proxy">Installs the initscripts for the nova spicehtml5proxy service</flag>
     <flag name="xen">xen hypervisor support</flag>
diff --git a/sys-cluster/nova/nova-2013.2.9999.ebuild b/sys-cluster/nova/nova-2013.2.9999.ebuild
index 4d59b574f8f7..5326994f18e9 100644
--- a/sys-cluster/nova/nova-2013.2.9999.ebuild
+++ b/sys-cluster/nova/nova-2013.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.2.9999.ebuild,v 1.11 2014/03/30 05:42:20 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.2.9999.ebuild,v 1.12 2014/04/01 03:46:51 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,9 +15,9 @@ EGIT_BRANCH="stable/havana"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+api +cert +compute +conductor +consoleauth ipv6 +kvm +network +novncproxy +rabbit +scheduler +spicehtml5proxy +xvpvncproxy sqlite mysql postgres xen"
+IUSE="+compute +kvm +network +novncproxy sqlite mysql postgres xen"
 REQUIRED_USE="|| ( mysql postgres sqlite )
-			  || ( kvm xen )"
+			  compute? ( || ( kvm xen ) )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
@@ -65,10 +65,9 @@ RDEPEND="sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
 		novncproxy? ( www-apps/novnc )
 		sys-apps/iproute2
 		net-misc/openvswitch
+		net-misc/rabbitmq-server
 		sys-fs/sysfsutils
 		sys-fs/multipath-tools
-		ipv6? ( net-misc/radvd )
-		rabbit? ( net-misc/rabbitmq-server )
 		kvm? ( app-emulation/qemu )
 		xen? ( app-emulation/xen
 			   app-emulation/xen-tools )"
@@ -83,47 +82,36 @@ pkg_setup() {
 
 python_install() {
 	distutils-r1_python_install
-	newconfd "${FILESDIR}/nova-confd" "nova"
-	newinitd "${FILESDIR}/nova-initd" "nova"
-	use api && dosym /etc/init.d/nova /etc/init.d/nova-api
-	use cert && dosym /etc/init.d/nova /etc/init.d/nova-cert
-	use compute && dosym /etc/init.d/nova /etc/init.d/nova-compute
-	use conductor && dosym /etc/init.d/nova /etc/init.d/nova-conductor
-	use consoleauth && dosym /etc/init.d/nova /etc/init.d/nova-consoleauth
-	use network &&  dosym /etc/init.d/nova /etc/init.d/nova-network
-	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-novncproxy
-	use scheduler && dosym /etc/init.d/nova /etc/init.d/nova-scheduler
-	use spicehtml5proxy && dosym /etc/init.d/nova /etc/init.d/nova-spicehtml5proxy
-	use xvpvncproxy && dosym /etc/init.d/nova /etc/init.d/nova-xvpncproxy
 
-	diropts -m 0750
-	dodir /var/run/nova /var/log/nova /var/lock/nova
-	fowners nova:nova /var/log/nova /var/lock/nova /var/run/nova
+	for svc in api cert compute conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+		newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+	done
+	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
 
-	diropts -m 0755
-	dodir /var/lib/nova/instances
-	fowners nova:nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+	dodir /var/log/nova /var/lib/nova/instances
 
-	keepdir /etc/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)
 	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 "isntalling CA files failed"
 
 	#add sudoers definitions for user nova
 	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
 	doins "${FILESDIR}/nova-sudoers"
 }