summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2018-01-27 21:49:54 -0600
committerMatthew Thode <prometheanfire@gentoo.org>2018-01-27 22:13:05 -0600
commit99aaee53d4f3f580b511255ae8cd5181211be32d (patch)
tree3f9813ba828f11b5c81b1b9a01e66851ac7c1fcd /app-admin/glance/files
parentsys-cluster/cinder: remove ocata (diff)
downloadgentoo-99aaee53d4f3f580b511255ae8cd5181211be32d.tar.gz
gentoo-99aaee53d4f3f580b511255ae8cd5181211be32d.tar.bz2
gentoo-99aaee53d4f3f580b511255ae8cd5181211be32d.zip
app-admin/glance: remove ocata
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'app-admin/glance/files')
-rw-r--r--app-admin/glance/files/glance.initd16
-rw-r--r--app-admin/glance/files/glance.initd-215
-rw-r--r--app-admin/glance/files/glance.initd-r217
3 files changed, 5 insertions, 43 deletions
diff --git a/app-admin/glance/files/glance.initd b/app-admin/glance/files/glance.initd
index 1ece1ad58f82..57274ac2dfee 100644
--- a/app-admin/glance/files/glance.initd
+++ b/app-admin/glance/files/glance.initd
@@ -1,21 +1,15 @@
#!/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=/usr/bin/${RC_SVCNAME}
+command_user="${GLANCE_USER:-glance}"
command_background=yes
-pidfile=/var/run/glance/${SVCNAME}.pid
-required_files=/etc/glance/${SVCNAME}.conf
-
-start_stop_daemon_args="--quiet --user ${GLANCE_USER:-glance}"
+pidfile=/run/${RC_SVCNAME}.pid
+required_files=/etc/glance/${RC_SVCNAME}.conf
depend() {
need net
}
-
-start_pre() {
- checkpath --directory --owner ${GLANCE_USER:-glance}:${GLANCE_GROUP:-glance} --mode 0755 ${GLANCE_RUN:-/var/run/glance}
-}
-
diff --git a/app-admin/glance/files/glance.initd-2 b/app-admin/glance/files/glance.initd-2
deleted file mode 100644
index 4d4849f77e78..000000000000
--- a/app-admin/glance/files/glance.initd-2
+++ /dev/null
@@ -1,15 +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/${RC_SVCNAME}
-command_user="${GLANCE_USER:-glance}"
-command_background=yes
-pidfile=/run/${RC_SVCNAME}.pid
-required_files=/etc/glance/${RC_SVCNAME}.conf
-
-depend() {
- need net
-}
diff --git a/app-admin/glance/files/glance.initd-r2 b/app-admin/glance/files/glance.initd-r2
deleted file mode 100644
index 338de069750c..000000000000
--- a/app-admin/glance/files/glance.initd-r2
+++ /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 ${RC_SVCNAME} service for OpenStack"
-
-command=/usr/bin/${RC_SVCNAME}
-command_user="${GLANCE_USER:-glance}"
-command_background=yes
-pidfile=/run/${RC_SVCNAME}.pid
-required_files=/etc/glance/${RC_SVCNAME}.conf
-
-start_stop_daemon_args="--quiet"
-
-depend() {
- need net
-}