slot conflicts, bug 508002. new init scripts.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xE1DF22D5

7 files changed, 73 insertions, 37 deletions

diff --git a/sys-cluster/cinder/ChangeLog b/sys-cluster/cinder/ChangeLog
index 1edc7e05b6e8..fc13a202fc4f 100644
--- a/sys-cluster/cinder/ChangeLog
+++ b/sys-cluster/cinder/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/cinder
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.33 2014/04/28 02:50:19 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.34 2014/05/11 12:22:00 vadimk Exp $
+
+*cinder-2014.1-r1 (11 May 2014)
+
+  11 May 2014; Vadim Kuznetsov vadimk@gentoo.org +cinder-2014.1-r1.ebuild,
+  +files/cinder.confd, +files/cinder.initd, +files/cinder.sudoersd,
+  -cinder-2014.1.ebuild, metadata.xml:
+  slot conflicts, bug 508002. new init scripts.
 
 *cinder-2014.1.9999 (28 Apr 2014)
 *cinder-2014.1 (28 Apr 2014)
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index b97bf51a86db..8aaa5e6d4567 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -4,29 +4,22 @@ Hash: SHA256
 AUX cinder-confd 75 SHA256 178148ecb30d9d1a03e4f5210dfa235be3028dc2af7d6f7a4c2e4d0ef190f0f3 SHA512 4dd3db170c1234906fa679ec6684cde16a6bdad4ac90d6a9c00bc0c4afc7ee40ebcebdc7071ad0a34f8eb5bd9c0ab32c6f8fc40624b6c575c4fbb58dad1c91e3 WHIRLPOOL 3f32cbe4f4935a5c5c34de77d638b4cbc10a7a75ba230be5be75af85b12179741bb970603252ec74f098319dffce6eef7e5f0c9bfa34a5b84119fb7642f22d22
 AUX cinder-init 1436 SHA256 ef93804e171364da98232fca2bf25adfb16e062c8b4dd69ce12f280b08ca8154 SHA512 b6d9d5a949cd43669a28b4e2c54cf795c92f070d10b56130f5a024fcbf9934d9e4f910e78972f427c979e68ee71c55006ecc9008eacf5c8abbe4c81c7b0731bf WHIRLPOOL 5983f6cbf500359d4e03b89d240f7652bd22655c0edcb858052062c4886c4da1d72ded228dd79847f74c279d5592dab2945807f611db1bf847a2c6d2b9f8f619
 AUX cinder-sudoers 86 SHA256 a2c2b8f50b21deaceaa2184c00725492cd96db44736cb3fe4bf4aaecc0805b6f SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 WHIRLPOOL 52642c53b34b089fb9c82c1307c02cd611ea834492a2919a12902bc974a146348a3dcde3db6058eb417395acaff8131398e70fbfa74c7325abcd695102f372c3
+AUX cinder.confd 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3
+AUX cinder.initd 744 SHA256 187237abfa1bef35136a95d0e2addffdf2fc3cff0e7c4f05e3523c31a16d377d SHA512 473aa626026adbcc132753f620702fcbe1bedef2b122cf212994b3bc453c27d56a3be1bec7229944f9be0478776001dba80f7cb7498cb46f314d2ee06a39f5f5 WHIRLPOOL 3b1667b2a1e089ecef68d9fa5315266d486c462820ea2304c76a5954c0b718983293de9c6a955695ae4fa7d9faedf36490d3ceda49775b4b81a441f67b4875d7
+AUX cinder.sudoersd 86 SHA256 a2c2b8f50b21deaceaa2184c00725492cd96db44736cb3fe4bf4aaecc0805b6f SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 WHIRLPOOL 52642c53b34b089fb9c82c1307c02cd611ea834492a2919a12902bc974a146348a3dcde3db6058eb417395acaff8131398e70fbfa74c7325abcd695102f372c3
 DIST cinder-2013.2.3.tar.gz 3223434 SHA256 a2740f0a0481139ae21cdb0868bebcce01b9f19832439b7f3056435e75791194 SHA512 b8e1451b3f01b2d76843fa0fe429f4b246f785f1d839397ef9ee4ab2bec1fff0f12d3f1d7ece63ee9b7ea71edf0b1aa24bb0cf685bb41e4deb9dfbbd433f175c WHIRLPOOL 11c5f8dd5fdbb1ca92ba10abccc64c292f61eac1b7bec7f681704bae623fa8bdaa585a42256496820fb1916788863a4ceb5f76f2214b85e21caf779770ccc001
 DIST cinder-2014.1.tar.gz 4624288 SHA256 5cd4e49e5e35906fcf9aa809e9d77319625383ea9ca5c4399a9d4b1c8ae984b5 SHA512 5937a735452f3bcde986ce48143415321f5a2bbc1fa33c29cc1e8d9425593d404945fb7926d881333795180788c23b790354245acb125d7d5361fa159abfac00 WHIRLPOOL 421b3f66d57d8ac33af63a7493fbe3a1c4be362a4412e7c15c7d995cb49c2d6570061c0a634e2864c5e006f22409be7c28c89a4a8c15835df3fb2eca697bb400
 EBUILD cinder-2013.2.3.ebuild 4756 SHA256 114ad223cace230ef64d518e992d70e70a108858e19b77eb304082b669a2acdf SHA512 f1ac8dd43587e37604a7452dd31f7b35b9a9ec4f98827e85b133f14c8e52a6b8debf970534e1a6a25856fc846a35b98134e598d1ab9bb811d7d49f1d4b1b1b8e WHIRLPOOL 60333c7f14a4e6d70389c803ae33332a424bd3ff223a6c5a8ec63a57a56e9db02839bd465b1aabde4371010103dd71cade87212555270719fdfbeeccfdec94e1
 EBUILD cinder-2013.2.9999.ebuild 4758 SHA256 7c15922c302e1b9a8c26fbc557892fd3a85bb23f18e877fb54b5443de069af2f SHA512 7aab183590ea0f38a13a94505dff770ee001e8e422f60c4178a61f9f997983cdfbdeb101cf837d99a37911648b5781b4f0851cb8020c81249e1dd485b58afad9 WHIRLPOOL 2e310912d350140d968694819052d7c70c4f47a5f1e92bb529699c2db10ab45f54127f28e703ad226c720a7feb0c80ab8e338db5c1dfdafb3325cba84dae0950
+EBUILD cinder-2014.1-r1.ebuild 4670 SHA256 0ae4888b738656e6771c4ad95a7f00118ca4a7d662f77b4fb78d6dc005dc73ef SHA512 50ea9f6897cdbff526e1b61c3a81296c589c6928de0543e5ba232e6cdcb7cd4d5ea8d94edef49459176da0af887168b9b341d8416de49b086dc469415984710d WHIRLPOOL dedaf58d32f43479a28fa262b292707d4c110cd7f77fe7187139e021132aaf1150926dd5978131e2544002335720e0284870d12aebb108b553b7fcbfa16f7772
 EBUILD cinder-2014.1.9999.ebuild 4946 SHA256 05301064c6814e8876da177644b33a07f150508a75923e7ec6e848499033ac36 SHA512 7ac7ed3bd45dec8dc70199d8c6b73250d30345712d18169166b8ba516197e251d8b2f4860ed4cf72448b2a6153615869bac31f0b7116127e4fae819570298dd3 WHIRLPOOL 51d638f60e0fa8db643d2006f031117f9964e604cca735212bc99d54e948cbdc658c4ad670f1e08aa80e55fe703386b3dc84feb599ec1fe70a6a468e49b300d9
-EBUILD cinder-2014.1.ebuild 4934 SHA256 d17aa44532fd95df292060db0a09e2a3064d3eff0d75a27cafbf857371f3cc4d SHA512 5d1726c6d70012b2a363263d7fcfd875a0faab6593453b18d1c6bb1216b5b8316659ecbfc4b77d60e4c72fbde111d36c6a046e6410ae557cb667a1231545d502 WHIRLPOOL 83b7c95d2b2a1d433f82d2e5689ce795dc273223ebb43c6f7aaf4e609a434bf956f16cee33c28db66a295b628afe07b3d5293866258b5a79e7ce370c3768118b
 EBUILD cinder-9999.ebuild 3651 SHA256 ef4e69e7dd8f0a7dfe1978f31f38e5c3a668f58ef7af1c76a78eda399c7dad70 SHA512 4c1d88905c4394f2acebff85759987b94e38a79319f9227096fca94edc3eb56810de742874060b811c3f61d92fa01e35141445bf78afdfb925f07753f628bd69 WHIRLPOOL ebd9e226babd7d5820c16a5b201c04daf9ed29cd6699731513d93f27caabacca13a59797a418a50271e6fa8ddef5e699322d1f095eb3d598fdbf3c1ad3887b4c
-MISC ChangeLog 6360 SHA256 9ed3676c515ee6e86572875242fbd30914f046629303187ff0b5f220bef6f042 SHA512 973331f92922cf43d2697763cd6ae98ab290d63dc2114ea8b333c905e1f8336767aeb8801bd23bd13d4dc5ac8c18710d0d400dc9741f79aa824e14c205c6a3b2 WHIRLPOOL a0deebeb690470962e878722fe4e97293cbd7e58886d72041987372b6f72bb0bd2a740779aaad90e9d99b66588ef56647fee1c1e5fb5d845d72b841195777eda
-MISC metadata.xml 661 SHA256 9621b252596847dcd9bb85787c8659a9724f082a4fbbae416fee6109a32ed379 SHA512 50232b02941c021dd6400937eb2d74e4813f576abdd7923b622b84af0d04dcf0367e6de9d829f457988ef57732975d1662c35eaca9e0226cd99cb9d52ce06df9 WHIRLPOOL ac55bae82fb59b42cdd9a09a71789a2b19eed96f65a795fedcad5718e5bf26161f2eb3ce133a4316487088eddd58ea0533eaac87679ca88ed1dfca3ccace3c66
+MISC ChangeLog 6616 SHA256 109d158f3d373b8250c169001f7ebaae1bf1ce1146df2611eb7299e6384c7a10 SHA512 5c4cfa96af480a5c27b757a723e46442d5dc6feddfba2fe2b9fe2d33f4fe91551f5aa44b1bd6729ca7b4bfd673f1086ac4e753d1ff261e736bbe935b2f385647 WHIRLPOOL cc8e446e964e250aa11769a6410f6e128d4c6e73977c2eb08d341e21af5f5190c70f53e02c333f5ee71cff9db5e1c31bc7a882348501d854b0a734fc0dd4323d
+MISC metadata.xml 921 SHA256 33d8d60945d6b793447e7a377cc35069a01dab1c874c0dac417772e585fdb2ee SHA512 e05cc2f145099d8b9bac3f4b4298b6ae628ad328b4602181020828d39aa74ced949487388daef52c0cb2b66ea3e6c64662fc1d3dd0a0a6b2b2b513afb6fc7b41 WHIRLPOOL 7c97874b37719acdcc222ce15eab14fbbdbea628038e9ab56bc740a3476265d8cfa7108c94c5809eb995a5aca2ad596ef51d8340b0202c3d1a5ea937ce6d5dc7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTXcIDAAoJECRx6z5ArFrDnlIP/jIgNG8/O3ySWXE1qjNRooIk
-+pSpTq/yl454s9Q8dDbac0j95tZOc9A8fD5Fva1epoRJDhRcCgr8vbf5VN1QTNJ8
-zn+GaAD5B8uxt1c12QpOPjPIMq7LWXpQxK3jv8y51REqICTd6voI+aH42qsMY10w
-5HnUsFfTzS3zhHCC96FiZa0xyZPD+7/8nbHiacVu3b8Bu7zR70AJ20hgZvy31TzE
-9TKlzV27lc/S0XAB+GMLxzf2nODCsMHfwuyMbQ7l2PSe2sqsSYtnW6uIvtpHtale
-kyLwHUml7cY2KmhJgmzGGpZnh37QJsTEbwdjF0eMc+8KV4rspij5LAuR+eRWDSqm
-uzf01Qaj8cdfEJN+gfb64J2A6WV1HzKDqz2Y51l6TQ5JuhIDIZfKo0EmiMstIO+d
-yG0k75iKLymso334Cv3EL1WX8ll0AmlSj9s7CEDA4+1Lhdz47s6KwooBvDMyvTOa
-njsBynjIOA8mIbGED0mKREM4TB02jGrVbsf4cp3CiGzkhpcejRAjBO9Mk4w/9+BN
-hOMmQwpLFmRT9ix670RJYTrqwrWFeFbSuSd3tNJ06WX7s/eE9oQj0O7HotWrZHRE
-SpxsW8HXv0aLTMCL+1jnFSKWZOX6m/3naHkt5kvfL5MPWFafBNiEUijxnnA1K2HP
-DaMDeDcuZ5rTETbC+vnl
-=I7H4
+iEYEAREIAAYFAlNva3kACgkQiLKviuHfItWomwCaAn/t1yM4IDXGsObdpFQDypO1
+p+MAni6NKXFF3b00Wteu4EFFiKJVoNJc
+=i1ve
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/cinder/cinder-2014.1.ebuild b/sys-cluster/cinder/cinder-2014.1-r1.ebuild
index d447ac9c530d..38c0f02842ea 100644
--- a/sys-cluster/cinder/cinder-2014.1.ebuild
+++ b/sys-cluster/cinder/cinder-2014.1-r1.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/cinder/cinder-2014.1.ebuild,v 1.1 2014/04/28 02:50:19 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.1-r1.ebuild,v 1.1 2014/05/11 12:22:00 vadimk Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="http://launchpad.net/${PN}/icehouse/${PV}/+download/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+api +scheduler +volume mysql postgres sqlite test"
+IUSE="+api +scheduler +volume iscsi lvm mysql postgres sqlite test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 #sudo is a build dep because I want the sudoers.d directory to exist, lazy.
@@ -39,7 +39,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
 				dev-python/oslo-sphinx[${PYTHON_USEDEP}] )"
 
-RDEPEND="=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
+RDEPEND=">=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}]
@@ -65,19 +65,19 @@ RDEPEND="=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
 		<dev-python/taskflow-0.2[${PYTHON_USEDEP}]
 		>=dev-python/rtslib-fb-2.1.39[${PYTHON_USEDEP}]
 		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-		sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
-			<dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] )
-		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
-			<dev-python/sqlalchemy-0.9.99[mysql,${PYTHON_USEDEP}] )
-		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
-			<dev-python/sqlalchemy-0.9.99[postgres,${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/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
 		>=dev-python/stevedore-0.14[${PYTHON_USEDEP}]
 		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
 		>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-		>=sys-block/iscsitarget-1.4.20.2_p20130821
-		sys-fs/lvm2
-		sys-block/open-iscsi
+		iscsi? (
+			>=sys-block/iscsitarget-1.4.20.2_p20130821
+			sys-block/open-iscsi )
+		lvm? ( sys-fs/lvm2 )
 		sys-fs/sysfsutils"
 
 PATCHES=( )
@@ -100,11 +100,10 @@ python_install() {
 	distutils-r1_python_install
 	keepdir /etc/cinder
 	dodir /etc/cinder/rootwrap.d
-	newinitd "${FILESDIR}/cinder-init" "cinder"
-	newconfd "${FILESDIR}/cinder-confd" "cinder"
-	use api && dosym /etc/init.d/cinder /etc/init.d/cinder-api
-	use scheduler && dosym /etc/init.d/cinder /etc/init.d/cinder-scheduler
-	use volume && dosym /etc/init.d/cinder /etc/init.d/cinder-volume
+
+	for svc in api scheduler volume; do
+		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+	done
 
 	insinto /etc/cinder
 	newins "${S}/etc/cinder/cinder.conf.sample" "cinder.conf"
@@ -115,9 +114,11 @@ python_install() {
 	insinto /etc/cinder/rootwrap.d
 	newins "${S}/etc/cinder/rootwrap.d/volume.filters" "volume.filters"
 
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	doins "${FILESDIR}/cinder-sudoers"
 	dodir /var/log/cinder
 	fowners cinder:cinder /var/log/cinder
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/cinder.sudoersd" cinder
 }
diff --git a/sys-cluster/cinder/files/cinder.confd b/sys-cluster/cinder/files/cinder.confd
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-cluster/cinder/files/cinder.confd
diff --git a/sys-cluster/cinder/files/cinder.initd b/sys-cluster/cinder/files/cinder.initd
new file mode 100644
index 000000000000..d8fdd28f66f1
--- /dev/null
+++ b/sys-cluster/cinder/files/cinder.initd
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/files/cinder.initd,v 1.1 2014/05/11 12:21:59 vadimk Exp $
+
+description="Starts ${SVCNAME} service for OpenStack"
+
+command=/usr/bin/${SVCNAME}
+command_background=yes
+command_args="--config-file /etc/cinder/cinder.conf --log-file /var/log/cinder/${SVCNAME}.log"
+pidfile=/var/run/cinder/${SVCNAME}.pid
+required_files=/etc/cinder/cinder.conf
+
+start_stop_daemon_args="--quiet --user ${CINDER_USER:-cinder}"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	checkpath --directory --owner ${CINDER_USER:-cinder}:${CINDER_GROUP:-cinder} --mode 0755 ${CINDER_RUN:-/var/run/cinder}
+}
+
diff --git a/sys-cluster/cinder/files/cinder.sudoersd b/sys-cluster/cinder/files/cinder.sudoersd
new file mode 100644
index 000000000000..f44bab4a5778
--- /dev/null
+++ b/sys-cluster/cinder/files/cinder.sudoersd
@@ -0,0 +1,4 @@
+Defaults:cinder !requiretty
+
+cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap 
+
diff --git a/sys-cluster/cinder/metadata.xml b/sys-cluster/cinder/metadata.xml
index 4388df02aa5d..652d3ddc4ed3 100644
--- a/sys-cluster/cinder/metadata.xml
+++ b/sys-cluster/cinder/metadata.xml
@@ -13,6 +13,14 @@
     <flag name="api">Installs the initscripts for the cinder api service</flag>
     <flag name="scheduler">Installs the initscripts for the cinder scheduler service</flag>
     <flag name="volume">Installs the initscripts for the cinder volume service</flag>
+    <flag name="iscsi">
+      Allow using an iSCSI remote storage server as pool for disk image storage
+    </flag>
+    <flag name="lvm">
+      Allow using the Logical Volume Manager (<pkg>sys-apps/lvm2</pkg>) as pool for disk image
+      storage
+    </flag>
+
   </use>
 </pkgmetadata>