sys-cluster/cinder: update init script

Package-Manager: Portage-2.3.8, Repoman-2.3.3

diff --git a/sys-cluster/cinder/cinder-11.0.0.ebuild b/sys-cluster/cinder/cinder-11.0.0.ebuild
index 780c94866e333ccd9b49414887cf36d9b3bd9396..26d79d7599410bae334c74e03c5f263ea71a56f8 100644 (file)
--- a/sys-cluster/cinder/cinder-11.0.0.ebuild
+++ b/sys-cluster/cinder/cinder-11.0.0.ebuild
@@ -177,7 +177,7 @@ python_install_all() {
        dodir /etc/cinder/rootwrap.d
 
        for svc in api scheduler volume; do
-               newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+               newinitd "${FILESDIR}/cinder.initd-2" cinder-${svc}
        done
 
        insinto /etc/cinder

diff --git a/sys-cluster/cinder/cinder-2017.2.9999.ebuild b/sys-cluster/cinder/cinder-2017.2.9999.ebuild
index 3adc118d7877d57c5d099e84563a686d7134ad3e..9db27e401adc2d4b152a05b22589e70406efbdbc 100644 (file)
--- a/sys-cluster/cinder/cinder-2017.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2017.2.9999.ebuild
@@ -178,7 +178,7 @@ python_install_all() {
        dodir /etc/cinder/rootwrap.d
 
        for svc in api scheduler volume; do
-               newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+               newinitd "${FILESDIR}/cinder.initd-2" cinder-${svc}
        done
 
        insinto /etc/cinder

diff --git a/sys-cluster/cinder/files/cinder.initd-2 b/sys-cluster/cinder/files/cinder.initd-2
new file mode 100644 (file)
index 0000000..8601a58
--- /dev/null
+++ b/sys-cluster/cinder/files/cinder.initd-2
@@ -0,0 +1,24 @@
+#!/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="--config-file /etc/cinder/cinder.conf --log-file /var/log/cinder/${SVCNAME}.log"
+pidfile=/var/run/cinder/${SVCNAME}.pid
+required_files=/etc/cinder/cinder.conf
+retry="SIGTERM/30"
+
+start_stop_daemon_args="--quiet --user ${CINDER_USER:-cinder}"
+
+depend() {
+       need net
+}
+
+start_pre() {
+       checkpath --directory --owner ${CINDER_USER:-cinder}:${CINDER_GROUP:-cinder} --mode 0755 ${CINDER_RUN:-/var/run/cinder}
+  checkpath --directory --owner ${CINDER_USER:-cinder}:${CINDER_GROUP:-cinder} --mode 0755 ${CINDER_LOCK:-/var/lock/cinder}
+}
+