diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-31 20:30:04 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-31 20:30:04 +0000 |
| commit | 4650985dd0e898b82e0d2ec225931297d4fadccf (patch) | |
| tree | eb0e8002cf3ebf1009110b6fec47fa90f873d824 /sys-cluster/neutron/files | |
| parent | 67f76a858f1ac826bd8a550d756d9ec6e340ed4f (diff) | |
gentoo resync : 31.01.2018
Diffstat (limited to 'sys-cluster/neutron/files')
| -rw-r--r-- | sys-cluster/neutron/files/neutron.initd | 13 | ||||
| -rw-r--r-- | sys-cluster/neutron/files/neutron.initd-2 | 17 |
2 files changed, 5 insertions, 25 deletions
diff --git a/sys-cluster/neutron/files/neutron.initd b/sys-cluster/neutron/files/neutron.initd index 803ccb58f70e..26bf768ddff3 100644 --- a/sys-cluster/neutron/files/neutron.initd +++ b/sys-cluster/neutron/files/neutron.initd @@ -1,20 +1,17 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 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 -pidfile=/var/run/neutron/"${SVCNAME}".pid +command_user="${NEUTRON_USER:-neutron}" +pidfile=/run/"${SVCNAME}".pid required_files=(${NEUTRON_CONFS[@]:-/etc/neutron/neutron.conf}) -command_args="${required_files[@]/#/--config-file } --log-file /var/log/neutron/${SVCNAME#*-}.log" -start_stop_daemon_args="--quiet --user ${NEUTRON_USER:-neutron}" +command_args="${required_files[@]/#/--config-file } --log-file ${NEUTRON_LOGDIR:-/var/log/neutron}/${SVCNAME#*-}.log" +retry="SIGTERM/15" depend() { need net } - -start_pre() { - checkpath --directory --owner "${NEUTRON_USER:-neutron}":"${NEUTRON_GROUP:-neutron}" --mode 0755 "${NEUTRON_RUN:-/var/run/neutron}" -} diff --git a/sys-cluster/neutron/files/neutron.initd-2 b/sys-cluster/neutron/files/neutron.initd-2 deleted file mode 100644 index 7a7dad6e6865..000000000000 --- a/sys-cluster/neutron/files/neutron.initd-2 +++ /dev/null @@ -1,17 +0,0 @@ -#!/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_user="${NEUTRON_USER:-neutron}" -pidfile=/run/"${SVCNAME}".pid -required_files=(${NEUTRON_CONFS[@]:-/etc/neutron/neutron.conf}) -command_args="${required_files[@]/#/--config-file } --log-file ${NEUTRON_LOGDIR:-/var/log/neutron}/${SVCNAME#*-}.log" -retry="SIGTERM/15" - -depend() { - need net -} |