| 1 |
prometheanfire 14/06/30 03:59:01 |
| 2 |
|
| 3 |
Modified: metadata.xml nova-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
fixed, all ebuilds use the correct initd bug 507628 |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.7 sys-cluster/nova/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/metadata.xml?rev=1.7&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/metadata.xml?rev=1.7&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/metadata.xml?r1=1.6&r2=1.7 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/nova/metadata.xml,v |
| 19 |
retrieving revision 1.6 |
| 20 |
retrieving revision 1.7 |
| 21 |
diff -u -r1.6 -r1.7 |
| 22 |
--- metadata.xml 1 Apr 2014 03:46:51 -0000 1.6 |
| 23 |
+++ metadata.xml 30 Jun 2014 03:59:01 -0000 1.7 |
| 24 |
@@ -11,18 +11,10 @@ |
| 25 |
(the main part of an IaaS system). It is written in Python. |
| 26 |
</longdescription> |
| 27 |
<use> |
| 28 |
- <flag name="api">Installs the initscripts for the nova api service</flag> |
| 29 |
- <flag name="cert">Installs the initscripts for the nova scheduler service</flag> |
| 30 |
<flag name="compute">Installs the initscripts for the nova volume service</flag> |
| 31 |
- <flag name="conductor">Installs the initscripts for the nova conductor service</flag> |
| 32 |
- <flag name="consoleauth">Installs the initscripts for the nova consoleauth service</flag> |
| 33 |
<flag name="kvm">qemu-kvm hypervisor support</flag> |
| 34 |
<flag name="network">Installs the initscripts for the nova network service</flag> |
| 35 |
<flag name="novncproxy">Installs the initscripts for the nova novncproxy service</flag> |
| 36 |
- <flag name="scheduler">Installs the initscripts for the nova scheduler service</flag> |
| 37 |
- <flag name="spicehtml5proxy">Installs the initscripts for the nova spicehtml5proxy service</flag> |
| 38 |
<flag name="xen">xen hypervisor support</flag> |
| 39 |
- <flag name="xvpvncproxy">Installs the initscripts for the nova xvpvncproxy service</flag> |
| 40 |
</use> |
| 41 |
</pkgmetadata> |
| 42 |
- |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.14 sys-cluster/nova/nova-9999.ebuild |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/nova-9999.ebuild?rev=1.14&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/nova-9999.ebuild?rev=1.14&content-type=text/plain |
| 50 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/nova-9999.ebuild?r1=1.13&r2=1.14 |
| 51 |
|
| 52 |
Index: nova-9999.ebuild |
| 53 |
=================================================================== |
| 54 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-9999.ebuild,v |
| 55 |
retrieving revision 1.13 |
| 56 |
retrieving revision 1.14 |
| 57 |
diff -u -r1.13 -r1.14 |
| 58 |
--- nova-9999.ebuild 8 Jan 2014 06:00:45 -0000 1.13 |
| 59 |
+++ nova-9999.ebuild 30 Jun 2014 03:59:01 -0000 1.14 |
| 60 |
@@ -1,6 +1,6 @@ |
| 61 |
# Copyright 1999-2014 Gentoo Foundation |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-9999.ebuild,v 1.13 2014/01/08 06:00:45 vapier Exp $ |
| 64 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-9999.ebuild,v 1.14 2014/06/30 03:59:01 prometheanfire Exp $ |
| 65 |
|
| 66 |
EAPI=5 |
| 67 |
PYTHON_COMPAT=( python2_7 ) |
| 68 |
@@ -14,60 +14,61 @@ |
| 69 |
LICENSE="Apache-2.0" |
| 70 |
SLOT="0" |
| 71 |
KEYWORDS="" |
| 72 |
-IUSE="+api +cert +compute +conductor +consoleauth +kvm +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy sqlite mysql postgres xen" |
| 73 |
+IUSE="+compute +kvm +network +novncproxy sqlite mysql postgres xen" |
| 74 |
REQUIRED_USE="|| ( mysql postgres sqlite ) |
| 75 |
- || ( kvm xen )" |
| 76 |
+ compute? ( || ( kvm xen ) )" |
| 77 |
|
| 78 |
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
| 79 |
+ >=dev-python/pbr-0.6[${PYTHON_USEDEP}] |
| 80 |
+ <dev-python/pbr-1.0[${PYTHON_USEDEP}] |
| 81 |
app-admin/sudo" |
| 82 |
|
| 83 |
-RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}] |
| 84 |
- >=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}] |
| 85 |
- dev-python/boto[${PYTHON_USEDEP}] |
| 86 |
- sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}] |
| 87 |
- <dev-python/sqlalchemy-0.7.10[sqlite,${PYTHON_USEDEP}] ) |
| 88 |
+RDEPEND="sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}] |
| 89 |
+ <dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] ) |
| 90 |
mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}] |
| 91 |
- <dev-python/sqlalchemy-0.7.10[mysql,${PYTHON_USEDEP}] ) |
| 92 |
+ <dev-python/sqlalchemy-0.9.99[mysql,${PYTHON_USEDEP}] ) |
| 93 |
postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}] |
| 94 |
- <dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] ) |
| 95 |
- >=dev-python/d2to1-0.2.10[${PYTHON_USEDEP}] |
| 96 |
- <dev-python/d2to1-0.3[${PYTHON_USEDEP}] |
| 97 |
- >=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}] |
| 98 |
- >=dev-python/jinja-2.0[${PYTHON_USEDEP}] |
| 99 |
- <dev-python/jinja-3[${PYTHON_USEDEP}] |
| 100 |
- >=dev-python/jsonschema-1.3.0[${PYTHON_USEDEP}] |
| 101 |
- !~dev-python/jsonschema-1.4.0[${PYTHON_USEDEP}] |
| 102 |
- >=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}] |
| 103 |
+ <dev-python/sqlalchemy-0.9.99[postgres,${PYTHON_USEDEP}] ) |
| 104 |
+ >=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}] |
| 105 |
+ >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}] |
| 106 |
+ virtual/python-argparse[${PYTHON_USEDEP}] |
| 107 |
+ >=dev-python/boto-2.12.0[${PYTHON_USEDEP}] |
| 108 |
+ !~dev-python/boto-2.13.0[${PYTHON_USEDEP}] |
| 109 |
+ >=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}] |
| 110 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
| 111 |
+ >=dev-python/kombu-2.4.8[${PYTHON_USEDEP}] |
| 112 |
>=dev-python/lxml-2.3[${PYTHON_USEDEP}] |
| 113 |
- >=dev-python/pbr-0.5.16[${PYTHON_USEDEP}] |
| 114 |
- <dev-python/pbr-0.6[${PYTHON_USEDEP}] |
| 115 |
>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}] |
| 116 |
- dev-python/six[${PYTHON_USEDEP}] |
| 117 |
- ~dev-python/webob-1.2.3[${PYTHON_USEDEP}] |
| 118 |
- >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}] |
| 119 |
+ >=dev-python/webob-1.2.3[${PYTHON_USEDEP}] |
| 120 |
+ >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] |
| 121 |
>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] |
| 122 |
dev-python/paste[${PYTHON_USEDEP}] |
| 123 |
- >=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}] |
| 124 |
+ >=dev-python/sqlalchemy-migrate-0.8.2[${PYTHON_USEDEP}] |
| 125 |
+ !~dev-python/sqlalchemy-migrate-0.8.4[${PYTHON_USEDEP}] |
| 126 |
>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}] |
| 127 |
>=dev-python/suds-0.4[${PYTHON_USEDEP}] |
| 128 |
- dev-python/paramiko[${PYTHON_USEDEP}] |
| 129 |
+ >=dev-python/paramiko-1.9.0[${PYTHON_USEDEP}] |
| 130 |
dev-python/pyasn1[${PYTHON_USEDEP}] |
| 131 |
- >=dev-python/Babel-0.9.6[${PYTHON_USEDEP}] |
| 132 |
- >=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}] |
| 133 |
- >=dev-python/python-cinderclient-1.0.1[${PYTHON_USEDEP}] |
| 134 |
- >=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}] |
| 135 |
- >=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}] |
| 136 |
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}] |
| 137 |
+ >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}] |
| 138 |
+ >=dev-python/python-cinderclient-1.0.6[${PYTHON_USEDEP}] |
| 139 |
+ >=dev-python/python-neutronclient-2.3.4[${PYTHON_USEDEP}] |
| 140 |
<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}] |
| 141 |
- >=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}] |
| 142 |
- >=dev-python/stevedore-0.10[${PYTHON_USEDEP}] |
| 143 |
+ >=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}] |
| 144 |
+ >=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}] |
| 145 |
+ >=dev-python/six-1.5.2[${PYTHON_USEDEP}] |
| 146 |
+ >=dev-python/stevedore-0.14[${PYTHON_USEDEP}] |
| 147 |
>=dev-python/websockify-0.5.1[${PYTHON_USEDEP}] |
| 148 |
<dev-python/websockify-0.6[${PYTHON_USEDEP}] |
| 149 |
>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}] |
| 150 |
- virtual/python-argparse[${PYTHON_USEDEP}] |
| 151 |
- app-emulation/libvirt[${PYTHON_USEDEP}] |
| 152 |
+ dev-python/oslo-rootwrap[${PYTHON_USEDEP}] |
| 153 |
+ >=dev-python/pycadf-0.4.1[${PYTHON_USEDEP}] |
| 154 |
+ >=dev-python/oslo-messaging-1.3.0[${PYTHON_USEDEP}] |
| 155 |
+ dev-python/libvirt-python[${PYTHON_USEDEP}] |
| 156 |
novncproxy? ( www-apps/novnc ) |
| 157 |
sys-apps/iproute2 |
| 158 |
net-misc/openvswitch |
| 159 |
+ net-misc/rabbitmq-server |
| 160 |
sys-fs/sysfsutils |
| 161 |
sys-fs/multipath-tools |
| 162 |
kvm? ( app-emulation/qemu ) |
| 163 |
@@ -82,49 +83,43 @@ |
| 164 |
enewuser nova -1 -1 /var/lib/nova nova |
| 165 |
} |
| 166 |
|
| 167 |
+python_compile() { |
| 168 |
+ distutils-r1_python_compile |
| 169 |
+ ./tools/config/generate_sample.sh -b ./ -p nova -o etc/nova |
| 170 |
+} |
| 171 |
+ |
| 172 |
python_install() { |
| 173 |
distutils-r1_python_install |
| 174 |
- newconfd "${FILESDIR}/nova-confd" "nova" |
| 175 |
- newinitd "${FILESDIR}/nova-initd" "nova" |
| 176 |
- use api && dosym /etc/init.d/nova /etc/init.d/nova-api |
| 177 |
- use cert && dosym /etc/init.d/nova /etc/init.d/nova-cert |
| 178 |
- use compute && dosym /etc/init.d/nova /etc/init.d/nova-compute |
| 179 |
- use conductor && dosym /etc/init.d/nova /etc/init.d/nova-conductor |
| 180 |
- use consoleauth && dosym /etc/init.d/nova /etc/init.d/nova-consoleauth |
| 181 |
- use network && dosym /etc/init.d/nova /etc/init.d/nova-network |
| 182 |
- use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-novncproxy |
| 183 |
- use scheduler && dosym /etc/init.d/nova /etc/init.d/nova-scheduler |
| 184 |
- use spicehtml5proxy && dosym /etc/init.d/nova /etc/init.d/nova-spicehtml5proxy |
| 185 |
- use xvpvncproxy && dosym /etc/init.d/nova /etc/init.d/nova-xvpncproxy |
| 186 |
- |
| 187 |
- diropts -m 0750 |
| 188 |
- dodir /var/run/nova /var/log/nova /var/lock/nova |
| 189 |
- fowners nova:nova /var/log/nova /var/lock/nova /var/run/nova |
| 190 |
- |
| 191 |
- diropts -m 0755 |
| 192 |
- dodir /var/lib/nova/instances |
| 193 |
- fowners nova:nova /var/lib/nova/instances |
| 194 |
|
| 195 |
- keepdir /etc/nova |
| 196 |
+ for svc in api cert compute conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do |
| 197 |
+ newinitd "${FILESDIR}/nova.initd" "nova-${svc}" |
| 198 |
+ done |
| 199 |
+ use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute" |
| 200 |
+ use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy" |
| 201 |
+ |
| 202 |
+ diropts -m 0750 -o nova -g nova |
| 203 |
+ dodir /var/log/nova /var/lib/nova/instances |
| 204 |
+ |
| 205 |
insinto /etc/nova |
| 206 |
+ insopts -m 0640 -o nova -g nova |
| 207 |
newins "etc/nova/nova.conf.sample" "nova.conf" |
| 208 |
doins "etc/nova/api-paste.ini" |
| 209 |
doins "etc/nova/logging_sample.conf" |
| 210 |
doins "etc/nova/policy.json" |
| 211 |
doins "etc/nova/rootwrap.conf" |
| 212 |
+ #rootwrap filters |
| 213 |
insinto /etc/nova/rootwrap.d |
| 214 |
doins "etc/nova/rootwrap.d/api-metadata.filters" |
| 215 |
doins "etc/nova/rootwrap.d/compute.filters" |
| 216 |
doins "etc/nova/rootwrap.d/network.filters" |
| 217 |
- |
| 218 |
#copy migration conf file (not coppied on install via setup.py script) |
| 219 |
insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/ |
| 220 |
doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg" |
| 221 |
- |
| 222 |
#copy the CA cert dir (not coppied on install via setup.py script) |
| 223 |
- cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "isntalling CA files failed" |
| 224 |
+ cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA files failed" |
| 225 |
|
| 226 |
#add sudoers definitions for user nova |
| 227 |
insinto /etc/sudoers.d/ |
| 228 |
+ insopts -m 0600 -o root -g root |
| 229 |
doins "${FILESDIR}/nova-sudoers" |
| 230 |
} |
| 231 |
|
| 232 |
|
| 233 |
|
| 234 |
1.68 sys-cluster/nova/ChangeLog |
| 235 |
|
| 236 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/ChangeLog?rev=1.68&view=markup |
| 237 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/ChangeLog?rev=1.68&content-type=text/plain |
| 238 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/ChangeLog?r1=1.67&r2=1.68 |
| 239 |
|
| 240 |
Index: ChangeLog |
| 241 |
=================================================================== |
| 242 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v |
| 243 |
retrieving revision 1.67 |
| 244 |
retrieving revision 1.68 |
| 245 |
diff -u -r1.67 -r1.68 |
| 246 |
--- ChangeLog 16 Jun 2014 03:35:39 -0000 1.67 |
| 247 |
+++ ChangeLog 30 Jun 2014 03:59:01 -0000 1.68 |
| 248 |
@@ -1,6 +1,10 @@ |
| 249 |
# ChangeLog for sys-cluster/nova |
| 250 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 251 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.67 2014/06/16 03:35:39 prometheanfire Exp $ |
| 252 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.68 2014/06/30 03:59:01 prometheanfire Exp $ |
| 253 |
+ |
| 254 |
+ 30 Jun 2014; Matthew Thode <prometheanfire@g.o> metadata.xml, |
| 255 |
+ nova-9999.ebuild: |
| 256 |
+ fixed, all ebuilds use the correct initd bug 507628 |
| 257 |
|
| 258 |
*nova-2014.1.1 (16 Jun 2014) |
Archives