[gentoo-commits] repo/gentoo:master commit in: sys-cluster/cinder/files/, sys-cluster/cinder/

[Matt Thode]

commit:     eae6dfae2055a669d81af7593ac6a64fb36706a5
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 18 03:55:28 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 04:54:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eae6dfae

sys-cluster/cinder:  update init script

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sys-cluster/cinder/cinder-11.0.0.ebuild      |  2 +-
 sys-cluster/cinder/cinder-2017.2.9999.ebuild |  2 +-
 sys-cluster/cinder/files/cinder.initd-2      | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/cinder/cinder-11.0.0.ebuild 
b/sys-cluster/cinder/cinder-11.0.0.ebuild
index 780c94866e3..26d79d75994 100644
--- 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 3adc118d787..9db27e401ad 100644
--- 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
index 00000000000..8601a5869b0
--- /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}
+}
+