commit: de13df47f5d1ee88da5b465bc2f293b579633537
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 18 04:51:34 2017 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 04:55:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de13df47
sys-cluster/neutron: updating init
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sys-cluster/neutron/files/neutron.initd-2 | 17 +++++++++++++++++
sys-cluster/neutron/neutron-11.0.0-r1.ebuild | 14 +++++++-------
sys-cluster/neutron/neutron-2017.2.9999.ebuild | 14 +++++++-------
3 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/sys-cluster/neutron/files/neutron.initd-2
b/sys-cluster/neutron/files/neutron.initd-2
new file mode 100644
index 00000000000..a558db0225e
--- /dev/null
+++ b/sys-cluster/neutron/files/neutron.initd-2
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Starts ${SVCNAME} service for OpenStack"
+
+command=/usr/bin/"${SVCNAME}"
+command_background=yes
+command_args="${required_files[@]/#/--config-file } --log-file
${NEUTRON_LOGDIR:-/var/log/neutron}/${SVCNAME#*-}.log"
+command_user="${NEUTRON_USER:-neutron}"
+pidfile=/run/"${SVCNAME}".pid
+required_files=(${NEUTRON_CONFS[@]:-/etc/neutron/neutron.conf})
+retry="SIGTERM/15"
+
+depend() {
+ need net
+}
diff --git a/sys-cluster/neutron/neutron-11.0.0-r1.ebuild
b/sys-cluster/neutron/neutron-11.0.0-r1.ebuild
index e58dc3c432f..3edbd0c8762 100644
--- a/sys-cluster/neutron/neutron-11.0.0-r1.ebuild
+++ b/sys-cluster/neutron/neutron-11.0.0-r1.ebuild
@@ -177,30 +177,30 @@ src_prepare() {
python_install_all() {
distutils-r1_python_install_all
if use server; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+ newinitd "${FILESDIR}/neutron.initd-2" "neutron-server"
newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
dosym /etc/neutron/plugin.ini
/etc/neutron/plugins/ml2/ml2_conf.ini
fi
if use dhcp; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+ newinitd "${FILESDIR}/neutron.initd-2" "neutron-dhcp-agent"
newconfd "${FILESDIR}/neutron-dhcp-agent.confd"
"neutron-dhcp-agent"
fi
if use l3; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+ newinitd "${FILESDIR}/neutron.initd-2" "neutron-l3-agent"
newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
fi
if use metadata; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+ newinitd "${FILESDIR}/neutron.initd-2" "neutron-metadata-agent"
newconfd "${FILESDIR}/neutron-metadata-agent.confd"
"neutron-metadata-agent"
fi
if use openvswitch; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+ newinitd "${FILESDIR}/neutron.initd-2"
"neutron-openvswitch-agent"
newconfd "${FILESDIR}/neutron-openvswitch-agent.confd"
"neutron-openvswitch-agent"
- newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+ newinitd "${FILESDIR}/neutron.initd-2" "neutron-ovs-cleanup"
newconfd "${FILESDIR}/neutron-openvswitch-agent.confd"
"neutron-ovs-cleanup"
fi
if use linuxbridge; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+ newinitd "${FILESDIR}/neutron.initd-2"
"neutron-linuxbridge-agent"
newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd"
"neutron-linuxbridge-agent"
fi
diropts -m 755 -o neutron -g neutron
diff --git a/sys-cluster/neutron/neutron-2017.2.9999.ebuild
b/sys-cluster/neutron/neutron-2017.2.9999.ebuild
index 0ee698e860d..d0129f9df24 100644
--- a/sys-cluster/neutron/neutron-2017.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2017.2.9999.ebuild
@@ -178,30 +178,30 @@ src_prepare() {
python_install_all() {
distutils-r1_python_install_all
if use server; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+ newinitd "${FILESDIR}/neutron.initd-2" "neutron-server"
newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
dosym /etc/neutron/plugin.ini
/etc/neutron/plugins/ml2/ml2_conf.ini
fi
if use dhcp; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+ newinitd "${FILESDIR}/neutron.initd-2" "neutron-dhcp-agent"
newconfd "${FILESDIR}/neutron-dhcp-agent.confd"
"neutron-dhcp-agent"
fi
if use l3; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+ newinitd "${FILESDIR}/neutron.initd-2" "neutron-l3-agent"
newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
fi
if use metadata; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+ newinitd "${FILESDIR}/neutron.initd-2" "neutron-metadata-agent"
newconfd "${FILESDIR}/neutron-metadata-agent.confd"
"neutron-metadata-agent"
fi
if use openvswitch; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+ newinitd "${FILESDIR}/neutron.initd-2"
"neutron-openvswitch-agent"
newconfd "${FILESDIR}/neutron-openvswitch-agent.confd"
"neutron-openvswitch-agent"
- newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+ newinitd "${FILESDIR}/neutron.initd-2" "neutron-ovs-cleanup"
newconfd "${FILESDIR}/neutron-openvswitch-agent.confd"
"neutron-ovs-cleanup"
fi
if use linuxbridge; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+ newinitd "${FILESDIR}/neutron.initd-2"
"neutron-linuxbridge-agent"
newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd"
"neutron-linuxbridge-agent"
fi
diropts -m 755 -o neutron -g neutron
