1 |
commit: d9b57bc67eefacce442cb56874e1f5cad5ada35e |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 28 03:44:25 2018 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 28 04:13:02 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9b57bc6 |
7 |
|
8 |
sys-cluster/nova: remove ocata |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
sys-cluster/nova/Manifest | 3 - |
13 |
sys-cluster/nova/files/nova.initd | 21 ++- |
14 |
sys-cluster/nova/files/nova.initd-2 | 25 ---- |
15 |
sys-cluster/nova/nova-15.1.0.ebuild | 232 ------------------------------- |
16 |
sys-cluster/nova/nova-16.0.4.ebuild | 6 +- |
17 |
sys-cluster/nova/nova-2017.1.9999.ebuild | 232 ------------------------------- |
18 |
sys-cluster/nova/nova-2017.2.9999.ebuild | 8 +- |
19 |
7 files changed, 15 insertions(+), 512 deletions(-) |
20 |
|
21 |
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest |
22 |
index d7e3583ed3c..da1cfb44b38 100644 |
23 |
--- a/sys-cluster/nova/Manifest |
24 |
+++ b/sys-cluster/nova/Manifest |
25 |
@@ -1,6 +1,3 @@ |
26 |
-DIST nova-15.1.0.tar.gz 5774942 BLAKE2B 6507658dabf1cc9da34c40bf3c5fb77c9e5692ceeea6fe4b38cca8be3cf532db6bbdd14dd71c78e1545791eaf26f60bd9337fca4561d811d1116a32458a86c6d SHA512 a35cc1a1891f0440470cb31cd23f835190d5961a962afc308f54ffe1bb0e47eb0e411915b47e8b89e7f76a2b3c348997848d86fd10123a375c7fbb8c118f66b0 |
27 |
DIST nova-16.0.4.tar.gz 10922054 BLAKE2B 1fb76f0a06149cb67543921cc9f49cd869ebcb85a813079cdde7ed38aded81d0ec5f157b7d031a9269c3df66081cac1d0732286356dc9f8af58de02ba688a9c9 SHA512 8841faca0d3864a7f63f4c6eec637e6676df2b1473dacd0265a34ce4cf8e50bc587892de2f3d54d1e7a499adb8e9c06aca6d7956d010ddabae1ea61c7c5b0581 |
28 |
-DIST nova.conf.sample-15.1.0 344760 BLAKE2B 0c227259325b201740a6a6e0f9a174b8a463ad30b9b09ca819ba23d85ba5471c4e958e23cf96bc8b2dab358521dfc52c216dffc110b46338e80b1821face84e4 SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d |
29 |
DIST nova.conf.sample-16.0.4 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378 |
30 |
-DIST nova.conf.sample-2017.1.9999 344760 BLAKE2B 0c227259325b201740a6a6e0f9a174b8a463ad30b9b09ca819ba23d85ba5471c4e958e23cf96bc8b2dab358521dfc52c216dffc110b46338e80b1821face84e4 SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d |
31 |
DIST nova.conf.sample-2017.2.9999 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378 |
32 |
|
33 |
diff --git a/sys-cluster/nova/files/nova.initd b/sys-cluster/nova/files/nova.initd |
34 |
index 7d679ed95fc..ba722949182 100644 |
35 |
--- a/sys-cluster/nova/files/nova.initd |
36 |
+++ b/sys-cluster/nova/files/nova.initd |
37 |
@@ -1,30 +1,25 @@ |
38 |
#!/sbin/openrc-run |
39 |
-# Copyright 1999-2016 Gentoo Foundation |
40 |
+# Copyright 1999-2018 Gentoo Foundation |
41 |
# Distributed under the terms of the GNU General Public License v2 |
42 |
|
43 |
description="Starts ${SVCNAME} service for OpenStack" |
44 |
|
45 |
-command="/usr/bin/${SVCNAME} -- --config-file /etc/nova/nova.conf" |
46 |
-pidfile=/var/run/nova/${SVCNAME}.pid |
47 |
+command="/usr/bin/${SVCNAME}" |
48 |
+command_args="--config-file /etc/nova/nova.conf" |
49 |
+pidfile=/run/${SVCNAME}.pid |
50 |
+command_background=true |
51 |
required_files=/etc/nova/nova.conf |
52 |
-start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova}" |
53 |
if [ "$SVCNAME" == nova-compute ]; then |
54 |
required_files="${required_files} /etc/nova/nova-compute.conf" |
55 |
- command="${command} --config-file /etc/nova/nova-compute.conf" |
56 |
+ command_args="${command_args} --config-file /etc/nova/nova-compute.conf" |
57 |
fi |
58 |
- |
59 |
+start_stop_daemon_args="-u ${NOVA_USER:-nova}" |
60 |
+retry="SIGTERM/15" |
61 |
|
62 |
depend() { |
63 |
use net |
64 |
} |
65 |
|
66 |
start_pre() { |
67 |
- checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/run/nova} |
68 |
checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/lock/nova} |
69 |
} |
70 |
- |
71 |
-start() { |
72 |
- ebegin "Starting ${SVCNAME}" |
73 |
- start-stop-daemon -S -b -m -p ${pidfile} -q -u ${NOVA_USER:-nova} -x ${command} |
74 |
- eend $? |
75 |
-} |
76 |
|
77 |
diff --git a/sys-cluster/nova/files/nova.initd-2 b/sys-cluster/nova/files/nova.initd-2 |
78 |
deleted file mode 100644 |
79 |
index cb82c947ddf..00000000000 |
80 |
--- a/sys-cluster/nova/files/nova.initd-2 |
81 |
+++ /dev/null |
82 |
@@ -1,25 +0,0 @@ |
83 |
-#!/sbin/openrc-run |
84 |
-# Copyright 1999-2017 Gentoo Foundation |
85 |
-# Distributed under the terms of the GNU General Public License v2 |
86 |
- |
87 |
-description="Starts ${SVCNAME} service for OpenStack" |
88 |
- |
89 |
-command="/usr/bin/${SVCNAME}" |
90 |
-command_args="--config-file /etc/nova/nova.conf" |
91 |
-pidfile=/run/${SVCNAME}.pid |
92 |
-command_background=true |
93 |
-required_files=/etc/nova/nova.conf |
94 |
-if [ "$SVCNAME" == nova-compute ]; then |
95 |
- required_files="${required_files} /etc/nova/nova-compute.conf" |
96 |
- command_args="${command_args} --config-file /etc/nova/nova-compute.conf" |
97 |
-fi |
98 |
-start_stop_daemon_args="-u ${NOVA_USER:-nova}" |
99 |
-retry="SIGTERM/15" |
100 |
- |
101 |
-depend() { |
102 |
- use net |
103 |
-} |
104 |
- |
105 |
-start_pre() { |
106 |
- checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/lock/nova} |
107 |
-} |
108 |
|
109 |
diff --git a/sys-cluster/nova/nova-15.1.0.ebuild b/sys-cluster/nova/nova-15.1.0.ebuild |
110 |
deleted file mode 100644 |
111 |
index 51f6f6060bf..00000000000 |
112 |
--- a/sys-cluster/nova/nova-15.1.0.ebuild |
113 |
+++ /dev/null |
114 |
@@ -1,232 +0,0 @@ |
115 |
-# Copyright 1999-2018 Gentoo Foundation |
116 |
-# Distributed under the terms of the GNU General Public License v2 |
117 |
- |
118 |
-EAPI=6 |
119 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
120 |
- |
121 |
-inherit distutils-r1 eutils linux-info multilib user |
122 |
- |
123 |
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python" |
124 |
-HOMEPAGE="https://launchpad.net/nova" |
125 |
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ocata/nova.conf.sample -> nova.conf.sample-${PV} |
126 |
- https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
127 |
- |
128 |
-LICENSE="Apache-2.0" |
129 |
-SLOT="0" |
130 |
-KEYWORDS="amd64 ~arm64 x86" |
131 |
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite" |
132 |
-REQUIRED_USE=" |
133 |
- !compute-only? ( || ( mysql postgres sqlite ) ) |
134 |
- compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )" |
135 |
- |
136 |
-CDEPEND=" |
137 |
- >=dev-python/setuptools-16.0[${PYTHON_USEDEP}] |
138 |
- !~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}] |
139 |
- !~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}] |
140 |
- !~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}] |
141 |
- !~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}] |
142 |
- !~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}] |
143 |
- !~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}] |
144 |
- !~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}] |
145 |
- !~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}] |
146 |
- !~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}] |
147 |
- !~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}] |
148 |
- !~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}] |
149 |
- !~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}] |
150 |
- >=dev-python/pbr-1.8[${PYTHON_USEDEP}]" |
151 |
-DEPEND=" |
152 |
- ${CDEPEND} |
153 |
- app-admin/sudo" |
154 |
- |
155 |
-RDEPEND=" |
156 |
- ${CDEPEND} |
157 |
- compute-only? ( |
158 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
159 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
160 |
- ) |
161 |
- sqlite? ( |
162 |
- >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] |
163 |
- <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] |
164 |
- ) |
165 |
- mysql? ( |
166 |
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] |
167 |
- !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] |
168 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
169 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
170 |
- ) |
171 |
- postgres? ( |
172 |
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] |
173 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
174 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
175 |
- ) |
176 |
- >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] |
177 |
- >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] |
178 |
- >=dev-python/jinja-2.8[${PYTHON_USEDEP}] |
179 |
- !~dev-python/jinja-2.9.0[${PYTHON_USEDEP}] |
180 |
- !~dev-python/jinja-2.9.1[${PYTHON_USEDEP}] |
181 |
- !~dev-python/jinja-2.9.2[${PYTHON_USEDEP}] |
182 |
- !~dev-python/jinja-2.9.3[${PYTHON_USEDEP}] |
183 |
- !~dev-python/jinja-2.9.4[${PYTHON_USEDEP}] |
184 |
- >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] |
185 |
- >=dev-python/lxml-2.3[${PYTHON_USEDEP}] |
186 |
- !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] |
187 |
- >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] |
188 |
- !~dev-python/routes-2.0[${PYTHON_USEDEP}] |
189 |
- !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] |
190 |
- !~dev-python/routes-2.3[${PYTHON_USEDEP}] |
191 |
- >=dev-python/cryptography-1.0[${PYTHON_USEDEP}] |
192 |
- !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] |
193 |
- >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] |
194 |
- >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] |
195 |
- >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] |
196 |
- dev-python/paste[${PYTHON_USEDEP}] |
197 |
- >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] |
198 |
- <dev-python/prettytable-0.8[${PYTHON_USEDEP}] |
199 |
- >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] |
200 |
- >=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}] |
201 |
- !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}] |
202 |
- >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}] |
203 |
- >=dev-python/paramiko-2.0[${PYTHON_USEDEP}] |
204 |
- >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] |
205 |
- >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] |
206 |
- >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}] |
207 |
- !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}] |
208 |
- <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}] |
209 |
- >=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}] |
210 |
- !~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}] |
211 |
- !~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}] |
212 |
- >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] |
213 |
- >=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}] |
214 |
- >=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}] |
215 |
- >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] |
216 |
- !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] |
217 |
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
218 |
- >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] |
219 |
- >=dev-python/websockify-0.8.0[${PYTHON_USEDEP}] |
220 |
- >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}] |
221 |
- >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] |
222 |
- >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] |
223 |
- !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] |
224 |
- >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] |
225 |
- >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] |
226 |
- >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] |
227 |
- >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] |
228 |
- >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] |
229 |
- >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] |
230 |
- >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}] |
231 |
- >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] |
232 |
- >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] |
233 |
- >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}] |
234 |
- >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] |
235 |
- >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] |
236 |
- >=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}] |
237 |
- >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] |
238 |
- >=dev-python/psutil-3.0.1[${PYTHON_USEDEP}] |
239 |
- >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}] |
240 |
- >=dev-python/os-brick-1.8.0[${PYTHON_USEDEP}] |
241 |
- >=dev-python/os-vif-1.4.0[${PYTHON_USEDEP}] |
242 |
- >=dev-python/os-win-1.4.0[${PYTHON_USEDEP}] |
243 |
- >=dev-python/castellan-0.4.0[${PYTHON_USEDEP}] |
244 |
- >=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}] |
245 |
- >=dev-python/os-xenapi-0.1.1[${PYTHON_USEDEP}] |
246 |
- dev-python/libvirt-python[${PYTHON_USEDEP}] |
247 |
- app-emulation/libvirt[iscsi?] |
248 |
- novncproxy? ( www-apps/novnc ) |
249 |
- sys-apps/iproute2 |
250 |
- openvswitch? ( net-misc/openvswitch ) |
251 |
- rabbitmq? ( net-misc/rabbitmq-server ) |
252 |
- memcached? ( |
253 |
- net-misc/memcached |
254 |
- >=dev-python/python-memcached-1.58 |
255 |
- ) |
256 |
- sys-fs/sysfsutils |
257 |
- sys-fs/multipath-tools |
258 |
- net-misc/bridge-utils |
259 |
- compute? ( |
260 |
- app-cdr/cdrtools |
261 |
- sys-fs/dosfstools |
262 |
- app-emulation/qemu |
263 |
- ) |
264 |
- iscsi? ( |
265 |
- sys-fs/lsscsi |
266 |
- >=sys-block/open-iscsi-2.0.873-r1 |
267 |
- )" |
268 |
- |
269 |
-#PATCHES=( |
270 |
-#) |
271 |
- |
272 |
-pkg_setup() { |
273 |
- linux-info_pkg_setup |
274 |
- CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \ |
275 |
- IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \ |
276 |
- NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \ |
277 |
- ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT" |
278 |
- if linux_config_exists; then |
279 |
- for module in ${CONFIG_CHECK_MODULES}; do |
280 |
- linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel" |
281 |
- done |
282 |
- fi |
283 |
- enewgroup nova |
284 |
- enewuser nova -1 -1 /var/lib/nova nova |
285 |
-} |
286 |
- |
287 |
-python_prepare_all() { |
288 |
- sed -i '/^hacking/d' test-requirements.txt || die |
289 |
- distutils-r1_python_prepare_all |
290 |
-} |
291 |
- |
292 |
-python_install_all() { |
293 |
- distutils-r1_python_install_all |
294 |
- |
295 |
- if use !compute-only; then |
296 |
- for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do |
297 |
- newinitd "${FILESDIR}/nova.initd" "nova-${svc}" |
298 |
- done |
299 |
- fi |
300 |
- use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute" |
301 |
- use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy" |
302 |
- |
303 |
- diropts -m 0750 -o nova -g qemu |
304 |
- dodir /var/log/nova /var/lib/nova/instances |
305 |
- diropts -m 0750 -o nova -g nova |
306 |
- |
307 |
- insinto /etc/nova |
308 |
- insopts -m 0640 -o nova -g nova |
309 |
- newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample" |
310 |
- doins "${FILESDIR}/nova-compute.conf" |
311 |
- doins "${S}/etc/nova/"* |
312 |
- # rootwrap filters |
313 |
- insopts -m 0644 |
314 |
- insinto /etc/nova/rootwrap.d |
315 |
- doins "etc/nova/rootwrap.d/api-metadata.filters" |
316 |
- doins "etc/nova/rootwrap.d/compute.filters" |
317 |
- doins "etc/nova/rootwrap.d/network.filters" |
318 |
- |
319 |
- # add sudoers definitions for user nova |
320 |
- insinto /etc/sudoers.d/ |
321 |
- insopts -m 0600 -o root -g root |
322 |
- doins "${FILESDIR}/nova-sudoers" |
323 |
- |
324 |
- if use iscsi ; then |
325 |
- # Install udev rules for handle iscsi disk with right links under /dev |
326 |
- udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules |
327 |
- |
328 |
- insinto /etc/nova/ |
329 |
- doins "${FILESDIR}/scsi-openscsi-link.sh" |
330 |
- fi |
331 |
-} |
332 |
- |
333 |
-python_install() { |
334 |
- distutils-r1_python_install |
335 |
- # copy migration conf file (not coppied on install via setup.py script) |
336 |
- insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/" |
337 |
- doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg" |
338 |
- # copy the CA cert dir (not coppied on install via setup.py script) |
339 |
- cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed" |
340 |
-} |
341 |
- |
342 |
-pkg_postinst() { |
343 |
- if use iscsi ; then |
344 |
- elog "iscsid needs to be running if you want cinder to connect" |
345 |
- fi |
346 |
-} |
347 |
|
348 |
diff --git a/sys-cluster/nova/nova-16.0.4.ebuild b/sys-cluster/nova/nova-16.0.4.ebuild |
349 |
index 7fe984e7df0..8856721e03f 100644 |
350 |
--- a/sys-cluster/nova/nova-16.0.4.ebuild |
351 |
+++ b/sys-cluster/nova/nova-16.0.4.ebuild |
352 |
@@ -199,11 +199,11 @@ python_install_all() { |
353 |
|
354 |
if use !compute-only; then |
355 |
for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do |
356 |
- newinitd "${FILESDIR}/nova.initd-2" "nova-${svc}" |
357 |
+ newinitd "${FILESDIR}/nova.initd" "nova-${svc}" |
358 |
done |
359 |
fi |
360 |
- use compute && newinitd "${FILESDIR}/nova.initd-2" "nova-compute" |
361 |
- use novncproxy && newinitd "${FILESDIR}/nova.initd-2" "nova-novncproxy" |
362 |
+ use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute" |
363 |
+ use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy" |
364 |
|
365 |
diropts -m 0750 -o nova -g qemu |
366 |
dodir /var/log/nova /var/lib/nova/instances |
367 |
|
368 |
diff --git a/sys-cluster/nova/nova-2017.1.9999.ebuild b/sys-cluster/nova/nova-2017.1.9999.ebuild |
369 |
deleted file mode 100644 |
370 |
index fa38dc98720..00000000000 |
371 |
--- a/sys-cluster/nova/nova-2017.1.9999.ebuild |
372 |
+++ /dev/null |
373 |
@@ -1,232 +0,0 @@ |
374 |
-# Copyright 1999-2017 Gentoo Foundation |
375 |
-# Distributed under the terms of the GNU General Public License v2 |
376 |
- |
377 |
-EAPI=6 |
378 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
379 |
- |
380 |
-inherit distutils-r1 eutils git-r3 linux-info multilib user |
381 |
- |
382 |
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python" |
383 |
-HOMEPAGE="https://launchpad.net/nova" |
384 |
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ocata/nova.conf.sample -> nova.conf.sample-${PV}" |
385 |
-EGIT_REPO_URI="https://github.com/openstack/nova.git" |
386 |
-EGIT_BRANCH="stable/ocata" |
387 |
- |
388 |
-LICENSE="Apache-2.0" |
389 |
-SLOT="0" |
390 |
-KEYWORDS="" |
391 |
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite" |
392 |
-REQUIRED_USE=" |
393 |
- !compute-only? ( || ( mysql postgres sqlite ) ) |
394 |
- compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )" |
395 |
- |
396 |
-CDEPEND=" |
397 |
- >=dev-python/setuptools-16.0[${PYTHON_USEDEP}] |
398 |
- !~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}] |
399 |
- !~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}] |
400 |
- !~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}] |
401 |
- !~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}] |
402 |
- !~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}] |
403 |
- !~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}] |
404 |
- !~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}] |
405 |
- !~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}] |
406 |
- !~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}] |
407 |
- !~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}] |
408 |
- !~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}] |
409 |
- >=dev-python/pbr-1.8[${PYTHON_USEDEP}]" |
410 |
-DEPEND=" |
411 |
- ${CDEPEND} |
412 |
- app-admin/sudo" |
413 |
- |
414 |
-RDEPEND=" |
415 |
- ${CDEPEND} |
416 |
- compute-only? ( |
417 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
418 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
419 |
- ) |
420 |
- sqlite? ( |
421 |
- >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] |
422 |
- <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] |
423 |
- ) |
424 |
- mysql? ( |
425 |
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] |
426 |
- !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] |
427 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
428 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
429 |
- ) |
430 |
- postgres? ( |
431 |
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] |
432 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
433 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
434 |
- ) |
435 |
- >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] |
436 |
- >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] |
437 |
- >=dev-python/jinja-2.8[${PYTHON_USEDEP}] |
438 |
- !~dev-python/jinja-2.9.0[${PYTHON_USEDEP}] |
439 |
- !~dev-python/jinja-2.9.1[${PYTHON_USEDEP}] |
440 |
- !~dev-python/jinja-2.9.2[${PYTHON_USEDEP}] |
441 |
- !~dev-python/jinja-2.9.3[${PYTHON_USEDEP}] |
442 |
- !~dev-python/jinja-2.9.4[${PYTHON_USEDEP}] |
443 |
- >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] |
444 |
- >=dev-python/lxml-2.3[${PYTHON_USEDEP}] |
445 |
- !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] |
446 |
- >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] |
447 |
- !~dev-python/routes-2.0[${PYTHON_USEDEP}] |
448 |
- !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] |
449 |
- !~dev-python/routes-2.3[${PYTHON_USEDEP}] |
450 |
- >=dev-python/cryptography-1.0[${PYTHON_USEDEP}] |
451 |
- !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] |
452 |
- >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] |
453 |
- >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] |
454 |
- >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] |
455 |
- dev-python/paste[${PYTHON_USEDEP}] |
456 |
- >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] |
457 |
- <dev-python/prettytable-0.8[${PYTHON_USEDEP}] |
458 |
- >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] |
459 |
- >=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}] |
460 |
- !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}] |
461 |
- >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}] |
462 |
- >=dev-python/paramiko-2.0[${PYTHON_USEDEP}] |
463 |
- >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] |
464 |
- >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] |
465 |
- >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}] |
466 |
- !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}] |
467 |
- <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}] |
468 |
- >=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}] |
469 |
- !~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}] |
470 |
- !~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}] |
471 |
- >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] |
472 |
- >=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}] |
473 |
- >=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}] |
474 |
- >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] |
475 |
- !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] |
476 |
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
477 |
- >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] |
478 |
- >=dev-python/websockify-0.8.0[${PYTHON_USEDEP}] |
479 |
- >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}] |
480 |
- >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] |
481 |
- >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] |
482 |
- !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] |
483 |
- >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] |
484 |
- >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] |
485 |
- >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] |
486 |
- >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] |
487 |
- >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] |
488 |
- >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] |
489 |
- >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}] |
490 |
- >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] |
491 |
- >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] |
492 |
- >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}] |
493 |
- >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] |
494 |
- >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] |
495 |
- >=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}] |
496 |
- >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] |
497 |
- >=dev-python/psutil-3.0.1[${PYTHON_USEDEP}] |
498 |
- >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}] |
499 |
- >=dev-python/os-brick-1.8.0[${PYTHON_USEDEP}] |
500 |
- >=dev-python/os-vif-1.4.0[${PYTHON_USEDEP}] |
501 |
- >=dev-python/os-win-1.4.0[${PYTHON_USEDEP}] |
502 |
- >=dev-python/castellan-0.4.0[${PYTHON_USEDEP}] |
503 |
- >=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}] |
504 |
- >=dev-python/os-xenapi-0.1.1[${PYTHON_USEDEP}] |
505 |
- dev-python/libvirt-python[${PYTHON_USEDEP}] |
506 |
- app-emulation/libvirt[iscsi?] |
507 |
- novncproxy? ( www-apps/novnc ) |
508 |
- sys-apps/iproute2 |
509 |
- openvswitch? ( net-misc/openvswitch ) |
510 |
- rabbitmq? ( net-misc/rabbitmq-server ) |
511 |
- memcached? ( |
512 |
- net-misc/memcached |
513 |
- >=dev-python/python-memcached-1.58 |
514 |
- ) |
515 |
- sys-fs/sysfsutils |
516 |
- sys-fs/multipath-tools |
517 |
- net-misc/bridge-utils |
518 |
- compute? ( |
519 |
- app-cdr/cdrtools |
520 |
- sys-fs/dosfstools |
521 |
- app-emulation/qemu |
522 |
- ) |
523 |
- iscsi? ( |
524 |
- sys-fs/lsscsi |
525 |
- >=sys-block/open-iscsi-2.0.873-r1 |
526 |
- )" |
527 |
- |
528 |
-#PATCHES=( |
529 |
-#) |
530 |
- |
531 |
-pkg_setup() { |
532 |
- linux-info_pkg_setup |
533 |
- CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \ |
534 |
- IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \ |
535 |
- NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \ |
536 |
- ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT" |
537 |
- if linux_config_exists; then |
538 |
- for module in ${CONFIG_CHECK_MODULES}; do |
539 |
- linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel" |
540 |
- done |
541 |
- fi |
542 |
- enewgroup nova |
543 |
- enewuser nova -1 -1 /var/lib/nova nova |
544 |
-} |
545 |
- |
546 |
-python_prepare_all() { |
547 |
- sed -i '/^hacking/d' test-requirements.txt || die |
548 |
- distutils-r1_python_prepare_all |
549 |
-} |
550 |
- |
551 |
-python_install_all() { |
552 |
- distutils-r1_python_install_all |
553 |
- |
554 |
- if use !compute-only; then |
555 |
- for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do |
556 |
- newinitd "${FILESDIR}/nova.initd" "nova-${svc}" |
557 |
- done |
558 |
- fi |
559 |
- use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute" |
560 |
- use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy" |
561 |
- |
562 |
- diropts -m 0750 -o nova -g qemu |
563 |
- dodir /var/log/nova /var/lib/nova/instances |
564 |
- diropts -m 0750 -o nova -g nova |
565 |
- |
566 |
- insinto /etc/nova |
567 |
- insopts -m 0640 -o nova -g nova |
568 |
- newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample" |
569 |
- doins "${FILESDIR}/nova-compute.conf" |
570 |
- doins "${S}/etc/nova/"* |
571 |
- # rootwrap filters |
572 |
- insopts -m 0644 |
573 |
- insinto /etc/nova/rootwrap.d |
574 |
- doins "etc/nova/rootwrap.d/api-metadata.filters" |
575 |
- doins "etc/nova/rootwrap.d/compute.filters" |
576 |
- doins "etc/nova/rootwrap.d/network.filters" |
577 |
- |
578 |
- # add sudoers definitions for user nova |
579 |
- insinto /etc/sudoers.d/ |
580 |
- insopts -m 0600 -o root -g root |
581 |
- doins "${FILESDIR}/nova-sudoers" |
582 |
- |
583 |
- if use iscsi ; then |
584 |
- # Install udev rules for handle iscsi disk with right links under /dev |
585 |
- udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules |
586 |
- |
587 |
- insinto /etc/nova/ |
588 |
- doins "${FILESDIR}/scsi-openscsi-link.sh" |
589 |
- fi |
590 |
-} |
591 |
- |
592 |
-python_install() { |
593 |
- distutils-r1_python_install |
594 |
- # copy migration conf file (not coppied on install via setup.py script) |
595 |
- insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/" |
596 |
- doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg" |
597 |
- # copy the CA cert dir (not coppied on install via setup.py script) |
598 |
- cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed" |
599 |
-} |
600 |
- |
601 |
-pkg_postinst() { |
602 |
- if use iscsi ; then |
603 |
- elog "iscsid needs to be running if you want cinder to connect" |
604 |
- fi |
605 |
-} |
606 |
|
607 |
diff --git a/sys-cluster/nova/nova-2017.2.9999.ebuild b/sys-cluster/nova/nova-2017.2.9999.ebuild |
608 |
index 4bc17bcde84..b3bfe7036df 100644 |
609 |
--- a/sys-cluster/nova/nova-2017.2.9999.ebuild |
610 |
+++ b/sys-cluster/nova/nova-2017.2.9999.ebuild |
611 |
@@ -1,4 +1,4 @@ |
612 |
-# Copyright 1999-2017 Gentoo Foundation |
613 |
+# Copyright 1999-2018 Gentoo Foundation |
614 |
# Distributed under the terms of the GNU General Public License v2 |
615 |
|
616 |
EAPI=6 |
617 |
@@ -200,11 +200,11 @@ python_install_all() { |
618 |
|
619 |
if use !compute-only; then |
620 |
for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do |
621 |
- newinitd "${FILESDIR}/nova.initd-2" "nova-${svc}" |
622 |
+ newinitd "${FILESDIR}/nova.initd" "nova-${svc}" |
623 |
done |
624 |
fi |
625 |
- use compute && newinitd "${FILESDIR}/nova.initd-2" "nova-compute" |
626 |
- use novncproxy && newinitd "${FILESDIR}/nova.initd-2" "nova-novncproxy" |
627 |
+ use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute" |
628 |
+ use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy" |
629 |
|
630 |
diropts -m 0750 -o nova -g qemu |
631 |
dodir /var/log/nova /var/lib/nova/instances |