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

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

[Matt Thode]

commit:     da1ec900bf353dff675a0d460445b24e3a4e0515
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 18:29:18 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 18:34:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da1ec900

sys-cluster/cinder: cleanup

Package-Manager: portage-2.3.0

 sys-cluster/cinder/files/cinder-confd   |  3 --
 sys-cluster/cinder/files/cinder-init    | 58 ---------------------------------
 sys-cluster/cinder/files/cinder-sudoers |  4 ---
 3 files changed, 65 deletions(-)

diff --git a/sys-cluster/cinder/files/cinder-confd b/sys-cluster/cinder/files/cinder-confd
deleted file mode 100644
index d09928c..00000000
--- a/sys-cluster/cinder/files/cinder-confd
+++ /dev/null
@@ -1,3 +0,0 @@
-#Don't touch this unless you know what you are doing
-PID_PATH=/run/cinder
-

diff --git a/sys-cluster/cinder/files/cinder-init b/sys-cluster/cinder/files/cinder-init
deleted file mode 100644
index 6747d12..00000000
--- a/sys-cluster/cinder/files/cinder-init
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
-SERVERNAME=$(echo $SVCNAME | cut -d '-' -f 2)
-
-depend() {
-    need net 
-}
-
-checkconfig() {
-    if [ ! -r /etc/conf.d/$BASENAME ]; then
-        eerror "No cinder conf.d file found: /etc/conf.d/$BASENAME)"
-        return 1
-    fi
-    return 0
-}
-
-start() {
-    checkconfig || return $?
-    . /etc/conf.d/$BASENAME
-    
-    ebegin "Starting ${SVCNAME}"
-        if [ ! -d ${PID_PATH} ]; then
-                mkdir ${PID_PATH}
-        chown cinder:root ${PID_PATH}
-        fi
-
-    start-stop-daemon --start \
-              --quiet \
-              --user cinder \
-              --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-              --make-pidfile \
-              --background \
-              --exec /usr/bin/cinder-${SERVERNAME} --  --config-file /etc/cinder/cinder.conf --log-file /var/log/cinder/cinder-${SERVERNAME}
-    
-    eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-    checkconfig || return $?
-    . /etc/conf.d/$BASENAME
-    
-    ebegin "Stopping ${SVCNAME}"
-    
-    start-stop-daemon --stop \
-              --quiet \
-              --user cinder \
-              --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-              --exec /usr/bin/cinder-${SERVERNAME} --  --config-file /etc/cinder/cinder.conf
-
-    eend $? "Failed to stop ${SVCNAME}"
-}
-
-#restart() {
-#
-#}

diff --git a/sys-cluster/cinder/files/cinder-sudoers b/sys-cluster/cinder/files/cinder-sudoers
deleted file mode 100644
index f44bab4..00000000
--- a/sys-cluster/cinder/files/cinder-sudoers
+++ /dev/null
@@ -1,4 +0,0 @@
-Defaults:cinder !requiretty
-
-cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap 
-

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

[Matt Thode]

commit:     8cf8f2203ea4ce5f07d7a0f06dff9f60850c8a04
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 18 04:33:36 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 04:55:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cf8f220

sys-cluster/cinder: updating init again

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sys-cluster/cinder/files/cinder.initd-2 | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/sys-cluster/cinder/files/cinder.initd-2 b/sys-cluster/cinder/files/cinder.initd-2
index 8601a5869b0..31584dee9d2 100644
--- a/sys-cluster/cinder/files/cinder.initd-2
+++ b/sys-cluster/cinder/files/cinder.initd-2
@@ -6,19 +6,12 @@ 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
+command_args="--config-file /etc/cinder/cinder.conf --log-file ${CINDER_LOGDIR:-/var/log/cinder}/${SVCNAME}.log"
+command_user="${CINDER_USER:-cinder}"
+pidfile=/run/${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}
-}
-