| 1 |
commit: da2296468021ed90ac06a686a693c3dbbca381c8 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 29 00:45:37 2016 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 29 00:47:13 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da229646 |
| 7 |
|
| 8 |
sys-cluster/nova: switch to cdrtools for bug 591784 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
sys-cluster/nova/files/nova-compute.conf | 2 ++ |
| 13 |
sys-cluster/nova/files/nova.initd | 11 ++++++++--- |
| 14 |
sys-cluster/nova/nova-2016.1.9999.ebuild | 3 ++- |
| 15 |
sys-cluster/nova/nova-2016.2.9999.ebuild | 3 ++- |
| 16 |
4 files changed, 14 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-cluster/nova/files/nova-compute.conf b/sys-cluster/nova/files/nova-compute.conf |
| 19 |
new file mode 100644 |
| 20 |
index 00000000..b006794 |
| 21 |
--- /dev/null |
| 22 |
+++ b/sys-cluster/nova/files/nova-compute.conf |
| 23 |
@@ -0,0 +1,2 @@ |
| 24 |
+[DEFAULT] |
| 25 |
+mkisofs_cmd = /usr/bin/mkisofs |
| 26 |
|
| 27 |
diff --git a/sys-cluster/nova/files/nova.initd b/sys-cluster/nova/files/nova.initd |
| 28 |
index e259fd9..a1ba549 100644 |
| 29 |
--- a/sys-cluster/nova/files/nova.initd |
| 30 |
+++ b/sys-cluster/nova/files/nova.initd |
| 31 |
@@ -1,5 +1,5 @@ |
| 32 |
#!/sbin/openrc-run |
| 33 |
-# Copyright 1999-2014 Gentoo Foundation |
| 34 |
+# Copyright 1999-2016 Gentoo Foundation |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
|
| 37 |
description="Starts ${SVCNAME} service for OpenStack" |
| 38 |
@@ -8,10 +8,15 @@ command=/usr/bin/${SVCNAME} |
| 39 |
command_background=yes |
| 40 |
pidfile=/var/run/nova/${SVCNAME}.pid |
| 41 |
required_files=/etc/nova/nova.conf |
| 42 |
-start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova}" |
| 43 |
+start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova} --config-file /etc/nova/nova.conf" |
| 44 |
+if [[ "$SVCNAME" == nova-compute ]]; then |
| 45 |
+ required_files="${required_files} /etc/nova/nova-compute.conf" |
| 46 |
+ start_stop_daemon_args="${start_stop_daemon_args} --config-file /etc/nova/nova-compute.conf" |
| 47 |
+fi |
| 48 |
+ |
| 49 |
|
| 50 |
depend() { |
| 51 |
- need net |
| 52 |
+ use net |
| 53 |
} |
| 54 |
|
| 55 |
start_pre() { |
| 56 |
|
| 57 |
diff --git a/sys-cluster/nova/nova-2016.1.9999.ebuild b/sys-cluster/nova/nova-2016.1.9999.ebuild |
| 58 |
index 1c02b05..d9b2ff6 100644 |
| 59 |
--- a/sys-cluster/nova/nova-2016.1.9999.ebuild |
| 60 |
+++ b/sys-cluster/nova/nova-2016.1.9999.ebuild |
| 61 |
@@ -120,7 +120,7 @@ RDEPEND=" |
| 62 |
sys-fs/multipath-tools |
| 63 |
net-misc/bridge-utils |
| 64 |
compute? ( |
| 65 |
- app-cdr/cdrkit |
| 66 |
+ app-cdr/cdrtools |
| 67 |
sys-fs/dosfstools |
| 68 |
app-emulation/qemu |
| 69 |
) |
| 70 |
@@ -170,6 +170,7 @@ python_install() { |
| 71 |
insinto /etc/nova |
| 72 |
insopts -m 0640 -o nova -g nova |
| 73 |
newins "${DISTDIR}/mitaka-nova.conf.sample" "nova.conf.sample" |
| 74 |
+ doins "${FILESDIR}/nova-compute.conf" |
| 75 |
doins "${S}/etc/nova/"* |
| 76 |
#rootwrap filters |
| 77 |
insopts -m 0644 |
| 78 |
|
| 79 |
diff --git a/sys-cluster/nova/nova-2016.2.9999.ebuild b/sys-cluster/nova/nova-2016.2.9999.ebuild |
| 80 |
index 27e0b1f..59fded1 100644 |
| 81 |
--- a/sys-cluster/nova/nova-2016.2.9999.ebuild |
| 82 |
+++ b/sys-cluster/nova/nova-2016.2.9999.ebuild |
| 83 |
@@ -132,7 +132,7 @@ RDEPEND=" |
| 84 |
sys-fs/multipath-tools |
| 85 |
net-misc/bridge-utils |
| 86 |
compute? ( |
| 87 |
- app-cdr/cdrkit |
| 88 |
+ app-cdr/cdrtools |
| 89 |
sys-fs/dosfstools |
| 90 |
app-emulation/qemu |
| 91 |
) |
| 92 |
@@ -182,6 +182,7 @@ python_install() { |
| 93 |
insinto /etc/nova |
| 94 |
insopts -m 0640 -o nova -g nova |
| 95 |
newins "${DISTDIR}/newton-nova.conf.sample" "nova.conf.sample" |
| 96 |
+ doins "${FILESDIR}/nova-compute.conf" |
| 97 |
doins "${S}/etc/nova/"* |
| 98 |
#rootwrap filters |
| 99 |
insopts -m 0644 |
Archives