prometheanfire 15/05/15 07:30:26
Modified: nova-2015.1.0-r1.ebuild nova-2015.1.9999.ebuild
ChangeLog
Log:
final pass at compute-only
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
0x33ED3FD25AFC78BA)
Revision Changes Path
1.3 sys-cluster/nova/nova-2015.1.0-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/nova-2015.1.0-r1.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/nova-2015.1.0-r1.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/nova-2015.1.0-r1.ebuild?r1=1.2&r2=1.3
Index: nova-2015.1.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.0-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nova-2015.1.0-r1.ebuild 14 May 2015 04:21:44 -0000 1.2
+++ nova-2015.1.0-r1.ebuild 15 May 2015 07:30:26 -0000 1.3
@@ -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-r1.ebuild,v
1.2 2015/05/14 04:21:44 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.0-r1.ebuild,v
1.3 2015/05/15 07:30:26 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -9,16 +9,15 @@
DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system)
written in Python"
HOMEPAGE="https://launchpad.net/nova";
-EGIT_REPO_URI="https://github.com/openstack/nova.git";
-EGIT_BRANCH="stable/kilo"
+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 +kvm +novncproxy openvswitch +rabbitmq sqlite
mysql postgres xen"
-REQUIRED_USE="|| ( mysql postgres sqlite )
- compute-only? ( compute !novncproxy !rabbitmq )
- compute? ( ^^ ( kvm xen ) )"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+ compute-only? ( compute
!novncproxy !rabbitmq !mysql !postgres !sqlite )
+ compute? ( ^^ ( kvm xen ) )"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
@@ -27,6 +26,10 @@
# 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}]
@@ -133,7 +136,7 @@
enewuser nova -1 -1 /var/lib/nova nova
}
-python_repare() {
+python_prepare() {
distutils-r1_python_prepare
sed -i 's/python/python2\.7/g' tools/config/generate_sample.sh || die
}
@@ -146,9 +149,11 @@
python_install() {
distutils-r1_python_install
- for svc in api cert compute conductor consoleauth network scheduler
spicehtml5proxy xvpvncproxy; do
- newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
- done
+ 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"
1.8 sys-cluster/nova/nova-2015.1.9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild?rev=1.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild?r1=1.7&r2=1.8
Index: nova-2015.1.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nova-2015.1.9999.ebuild 14 May 2015 04:21:44 -0000 1.7
+++ nova-2015.1.9999.ebuild 15 May 2015 07:30:26 -0000 1.8
@@ -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.7 2015/05/14 04:21:44 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild,v
1.8 2015/05/15 07:30:26 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -16,9 +16,9 @@
SLOT="0"
KEYWORDS=""
IUSE="+compute compute-only +kvm +novncproxy openvswitch +rabbitmq sqlite
mysql postgres xen"
-REQUIRED_USE="|| ( mysql postgres sqlite )
- compute-only? ( compute !novncproxy !rabbitmq )
- compute? ( ^^ ( kvm xen ) )"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+ compute-only? ( compute
!novncproxy !rabbitmq !mysql !postgres !sqlite )
+ compute? ( ^^ ( kvm xen ) )"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
@@ -27,6 +27,10 @@
# 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}]
@@ -133,7 +137,7 @@
enewuser nova -1 -1 /var/lib/nova nova
}
-python_repare() {
+python_prepare() {
distutils-r1_python_prepare
sed -i 's/python/python2\.7/g' tools/config/generate_sample.sh || die
}
@@ -146,9 +150,11 @@
python_install() {
distutils-r1_python_install
- for svc in api cert compute conductor consoleauth network scheduler
spicehtml5proxy xvpvncproxy; do
- newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
- done
+ 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"
1.94 sys-cluster/nova/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/ChangeLog?rev=1.94&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/ChangeLog?rev=1.94&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/ChangeLog?r1=1.93&r2=1.94
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- ChangeLog 14 May 2015 04:21:44 -0000 1.93
+++ ChangeLog 15 May 2015 07:30:26 -0000 1.94
@@ -1,6 +1,10 @@
# 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.93
2015/05/14 04:21:44 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.94
2015/05/15 07:30:26 prometheanfire Exp $
+
+ 15 May 2015; Matthew Thode <[email protected]>
+ nova-2015.1.0-r1.ebuild, nova-2015.1.9999.ebuild:
+ final pass at compute-only
14 May 2015; Matthew Thode <[email protected]>
nova-2015.1.0-r1.ebuild, nova-2015.1.9999.ebuild:
