diff options
| author |   Matthew Thode <prometheanfire@gentoo.org> | 2018-01-27 21:44:25 -0600 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2018-01-27 22:13:02 -0600 |
| commit | d9b57bc67eefacce442cb56874e1f5cad5ada35e (patch) | |
| tree | 81f2c4467f14e6b5ad80bcb4a56860d8ecba2705 /sys-cluster/nova/files | |
| parent | sys-cluster/heat: remove ocata (diff) | |
| download | gentoo-d9b57bc67eefacce442cb56874e1f5cad5ada35e.tar.gz gentoo-d9b57bc67eefacce442cb56874e1f5cad5ada35e.tar.bz2 gentoo-d9b57bc67eefacce442cb56874e1f5cad5ada35e.zip | |
sys-cluster/nova: remove ocata
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'sys-cluster/nova/files')
| -rw-r--r-- | sys-cluster/nova/files/nova.initd | 21 | ||||
| -rw-r--r-- | sys-cluster/nova/files/nova.initd-2 | 25 |
2 files changed, 8 insertions, 38 deletions
diff --git a/sys-cluster/nova/files/nova.initd b/sys-cluster/nova/files/nova.initd index 7d679ed95fc9..ba722949182e 100644 --- a/sys-cluster/nova/files/nova.initd +++ b/sys-cluster/nova/files/nova.initd @@ -1,30 +1,25 @@ #!/sbin/openrc-run -# Copyright 1999-2016 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} -- --config-file /etc/nova/nova.conf" -pidfile=/var/run/nova/${SVCNAME}.pid +command="/usr/bin/${SVCNAME}" +command_args="--config-file /etc/nova/nova.conf" +pidfile=/run/${SVCNAME}.pid +command_background=true required_files=/etc/nova/nova.conf -start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova}" if [ "$SVCNAME" == nova-compute ]; then required_files="${required_files} /etc/nova/nova-compute.conf" - command="${command} --config-file /etc/nova/nova-compute.conf" + command_args="${command_args} --config-file /etc/nova/nova-compute.conf" fi - +start_stop_daemon_args="-u ${NOVA_USER:-nova}" +retry="SIGTERM/15" depend() { use net } start_pre() { - checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/run/nova} checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/lock/nova} } - -start() { - ebegin "Starting ${SVCNAME}" - start-stop-daemon -S -b -m -p ${pidfile} -q -u ${NOVA_USER:-nova} -x ${command} - eend $? -} diff --git a/sys-cluster/nova/files/nova.initd-2 b/sys-cluster/nova/files/nova.initd-2 deleted file mode 100644 index cb82c947ddfe..000000000000 --- a/sys-cluster/nova/files/nova.initd-2 +++ /dev/null @@ -1,25 +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_args="--config-file /etc/nova/nova.conf" -pidfile=/run/${SVCNAME}.pid -command_background=true -required_files=/etc/nova/nova.conf -if [ "$SVCNAME" == nova-compute ]; then - required_files="${required_files} /etc/nova/nova-compute.conf" - command_args="${command_args} --config-file /etc/nova/nova-compute.conf" -fi -start_stop_daemon_args="-u ${NOVA_USER:-nova}" -retry="SIGTERM/15" - -depend() { - use net -} - -start_pre() { - checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/lock/nova} -} |