[openstack-ceilometer] Merge epel6 and Fedora spec files
Nejc Saje
nsaje at fedoraproject.org
Wed Aug 20 07:01:57 UTC 2014
commit bf73786164a8e58cee2805eeff1883a3c498fc3c
Author: Nejc Saje <nsaje at redhat.com>
Date: Mon Aug 18 07:38:29 2014 -0400
Merge epel6 and Fedora spec files
merge spec files and add back init and upstart files
openstack-ceilometer-alarm-evaluator.init | 102 ++++++++++++
openstack-ceilometer-alarm-evaluator.upstart | 8 +
openstack-ceilometer-alarm-notifier.init | 102 ++++++++++++
openstack-ceilometer-alarm-notifier.upstart | 8 +
openstack-ceilometer-api.init | 102 ++++++++++++
openstack-ceilometer-api.upstart | 8 +
openstack-ceilometer-central.init | 102 ++++++++++++
openstack-ceilometer-central.upstart | 8 +
openstack-ceilometer-collector.init | 102 ++++++++++++
openstack-ceilometer-collector.upstart | 8 +
openstack-ceilometer-compute.init | 102 ++++++++++++
openstack-ceilometer-compute.upstart | 8 +
openstack-ceilometer-newdeps.patch | 25 +++
openstack-ceilometer-notification.init | 102 ++++++++++++
openstack-ceilometer-notification.upstart | 8 +
openstack-ceilometer.spec | 223 ++++++++++++++++++++++----
16 files changed, 987 insertions(+), 31 deletions(-)
---
diff --git a/openstack-ceilometer-alarm-evaluator.init b/openstack-ceilometer-alarm-evaluator.init
new file mode 100644
index 0000000..265576e
--- /dev/null
+++ b/openstack-ceilometer-alarm-evaluator.init
@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+# openstack-ceilometer-alarm-evaluator OpenStack ceilometer alarm evaluation service
+#
+# chkconfig: - 98 02
+# description: OpenStack measurement and collection alarm evaluation service
+
+### BEGIN INIT INFO
+# Provides:
+# Required-Start: $remote_fs $network $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Stop: 0 1 6
+# Short-Description: OpenStack ceilometer alarm evaluation service
+# Description: OpenStack measurement and collection alarm evaluation service
+### END INIT INFO
+
+. /etc/rc.d/init.d/functions
+
+suffix=alarm-evaluator
+prog=openstack-ceilometer-$suffix
+exec="/usr/bin/ceilometer-$suffix"
+config="/etc/ceilometer/ceilometer.conf"
+pidfile="/var/run/ceilometer/ceilometer-$suffix.pid"
+logfile="/var/log/ceilometer/$suffix.log"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
+
+start() {
+ [ -x $exec ] || exit 5
+ [ -f $config ] || exit 6
+ echo -n $"Starting $prog: "
+ daemon --user ceilometer --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && touch $lockfile
+ return $retval
+}
+
+stop() {
+ echo -n $"Stopping $prog: "
+ killproc -p $pidfile $prog
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && rm -f $lockfile
+ return $retval
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ restart
+}
+
+force_reload() {
+ restart
+}
+
+rh_status() {
+ status -p $pidfile $prog
+}
+
+rh_status_q() {
+ rh_status >/dev/null 2>&1
+}
+
+
+case "$1" in
+ start)
+ rh_status_q && exit 0
+ $1
+ ;;
+ stop)
+ rh_status_q || exit 0
+ $1
+ ;;
+ restart)
+ $1
+ ;;
+ reload)
+ rh_status_q || exit 7
+ $1
+ ;;
+ force-reload)
+ force_reload
+ ;;
+ status)
+ rh_status
+ ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ exit 2
+esac
+exit $?
diff --git a/openstack-ceilometer-alarm-evaluator.upstart b/openstack-ceilometer-alarm-evaluator.upstart
new file mode 100644
index 0000000..c3d665d
--- /dev/null
+++ b/openstack-ceilometer-alarm-evaluator.upstart
@@ -0,0 +1,8 @@
+description "OpenStack Ceilometer alarm evaluation service"
+
+start on stopped rc RUNLEVEL=[2345]
+stop on runlevel [S016]
+
+respawn
+
+exec su -s /bin/sh -c "exec /usr/bin/ceilometer-alarm-evaluator --logfile /var/log/ceilometer/alarm-evaluator.log" ceilometer
diff --git a/openstack-ceilometer-alarm-notifier.init b/openstack-ceilometer-alarm-notifier.init
new file mode 100644
index 0000000..424e6ac
--- /dev/null
+++ b/openstack-ceilometer-alarm-notifier.init
@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+# openstack-ceilometer-alarm-notifier OpenStack ceilometer alarm notification service
+#
+# chkconfig: - 98 02
+# description: OpenStack measurement and collection alarm notification service
+
+### BEGIN INIT INFO
+# Provides:
+# Required-Start: $remote_fs $network $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Stop: 0 1 6
+# Short-Description: OpenStack ceilometer alarm notification service
+# Description: OpenStack measurement and collection alarm notification service
+### END INIT INFO
+
+. /etc/rc.d/init.d/functions
+
+suffix=alarm-notifier
+prog=openstack-ceilometer-$suffix
+exec="/usr/bin/ceilometer-$suffix"
+config="/etc/ceilometer/ceilometer.conf"
+pidfile="/var/run/ceilometer/ceilometer-$suffix.pid"
+logfile="/var/log/ceilometer/$suffix.log"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
+
+start() {
+ [ -x $exec ] || exit 5
+ [ -f $config ] || exit 6
+ echo -n $"Starting $prog: "
+ daemon --user ceilometer --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && touch $lockfile
+ return $retval
+}
+
+stop() {
+ echo -n $"Stopping $prog: "
+ killproc -p $pidfile $prog
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && rm -f $lockfile
+ return $retval
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ restart
+}
+
+force_reload() {
+ restart
+}
+
+rh_status() {
+ status -p $pidfile $prog
+}
+
+rh_status_q() {
+ rh_status >/dev/null 2>&1
+}
+
+
+case "$1" in
+ start)
+ rh_status_q && exit 0
+ $1
+ ;;
+ stop)
+ rh_status_q || exit 0
+ $1
+ ;;
+ restart)
+ $1
+ ;;
+ reload)
+ rh_status_q || exit 7
+ $1
+ ;;
+ force-reload)
+ force_reload
+ ;;
+ status)
+ rh_status
+ ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ exit 2
+esac
+exit $?
diff --git a/openstack-ceilometer-alarm-notifier.upstart b/openstack-ceilometer-alarm-notifier.upstart
new file mode 100644
index 0000000..9a92074
--- /dev/null
+++ b/openstack-ceilometer-alarm-notifier.upstart
@@ -0,0 +1,8 @@
+description "OpenStack Ceilometer alarm notification service"
+
+start on stopped rc RUNLEVEL=[2345]
+stop on runlevel [S016]
+
+respawn
+
+exec su -s /bin/sh -c "exec /usr/bin/ceilometer-alarm-notifier --logfile /var/log/ceilometer/alarm-notifier.log" ceilometer
diff --git a/openstack-ceilometer-api.init b/openstack-ceilometer-api.init
new file mode 100644
index 0000000..731c64c
--- /dev/null
+++ b/openstack-ceilometer-api.init
@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+# openstack-ceilometer-api OpenStack ceilometer API Server
+#
+# chkconfig: - 98 02
+# description: OpenStack measurement and collection service API server
+
+### BEGIN INIT INFO
+# Provides:
+# Required-Start: $remote_fs $network $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Stop: 0 1 6
+# Short-Description: OpenStack ceilometer API Server
+# Description: OpenStack measurement and collection service API server
+### END INIT INFO
+
+. /etc/rc.d/init.d/functions
+
+suffix=api
+prog=openstack-ceilometer-$suffix
+exec="/usr/bin/ceilometer-$suffix"
+config="/etc/ceilometer/ceilometer.conf"
+pidfile="/var/run/ceilometer/ceilometer-$suffix.pid"
+logfile="/var/log/ceilometer/$suffix.log"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
+
+start() {
+ [ -x $exec ] || exit 5
+ [ -f $config ] || exit 6
+ echo -n $"Starting $prog: "
+ daemon --user ceilometer --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && touch $lockfile
+ return $retval
+}
+
+stop() {
+ echo -n $"Stopping $prog: "
+ killproc -p $pidfile $prog
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && rm -f $lockfile
+ return $retval
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ restart
+}
+
+force_reload() {
+ restart
+}
+
+rh_status() {
+ status -p $pidfile $prog
+}
+
+rh_status_q() {
+ rh_status >/dev/null 2>&1
+}
+
+
+case "$1" in
+ start)
+ rh_status_q && exit 0
+ $1
+ ;;
+ stop)
+ rh_status_q || exit 0
+ $1
+ ;;
+ restart)
+ $1
+ ;;
+ reload)
+ rh_status_q || exit 7
+ $1
+ ;;
+ force-reload)
+ force_reload
+ ;;
+ status)
+ rh_status
+ ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ exit 2
+esac
+exit $?
diff --git a/openstack-ceilometer-api.upstart b/openstack-ceilometer-api.upstart
new file mode 100644
index 0000000..56b66eb
--- /dev/null
+++ b/openstack-ceilometer-api.upstart
@@ -0,0 +1,8 @@
+description "OpenStack Ceilometer API Server"
+
+start on stopped rc RUNLEVEL=[2345]
+stop on runlevel [S016]
+
+respawn
+
+exec su -s /bin/sh -c "exec /usr/bin/ceilometer-api --logfile /var/log/ceilometer/api.log" ceilometer
diff --git a/openstack-ceilometer-central.init b/openstack-ceilometer-central.init
new file mode 100644
index 0000000..5d4d1ab
--- /dev/null
+++ b/openstack-ceilometer-central.init
@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+# openstack-ceilometer-central OpenStack ceilometer central agent
+#
+# chkconfig: - 98 02
+# description: OpenStack measurement and collection service central agent
+
+### BEGIN INIT INFO
+# Provides:
+# Required-Start: $remote_fs $network $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Stop: 0 1 6
+# Short-Description: OpenStack ceilometer central agent
+# Description: OpenStack measurement and collection service central agent
+### END INIT INFO
+
+. /etc/rc.d/init.d/functions
+
+suffix=central
+prog=openstack-ceilometer-$suffix
+exec="/usr/bin/ceilometer-agent-$suffix"
+config="/etc/ceilometer/ceilometer.conf"
+pidfile="/var/run/ceilometer/ceilometer-$suffix.pid"
+logfile="/var/log/ceilometer/$suffix.log"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
+
+start() {
+ [ -x $exec ] || exit 5
+ [ -f $config ] || exit 6
+ echo -n $"Starting $prog: "
+ daemon --user ceilometer --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && touch $lockfile
+ return $retval
+}
+
+stop() {
+ echo -n $"Stopping $prog: "
+ killproc -p $pidfile $prog
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && rm -f $lockfile
+ return $retval
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ restart
+}
+
+force_reload() {
+ restart
+}
+
+rh_status() {
+ status -p $pidfile $prog
+}
+
+rh_status_q() {
+ rh_status >/dev/null 2>&1
+}
+
+
+case "$1" in
+ start)
+ rh_status_q && exit 0
+ $1
+ ;;
+ stop)
+ rh_status_q || exit 0
+ $1
+ ;;
+ restart)
+ $1
+ ;;
+ reload)
+ rh_status_q || exit 7
+ $1
+ ;;
+ force-reload)
+ force_reload
+ ;;
+ status)
+ rh_status
+ ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ exit 2
+esac
+exit $?
diff --git a/openstack-ceilometer-central.upstart b/openstack-ceilometer-central.upstart
new file mode 100644
index 0000000..889cda9
--- /dev/null
+++ b/openstack-ceilometer-central.upstart
@@ -0,0 +1,8 @@
+description "OpenStack Ceilometer central agent"
+
+start on stopped rc RUNLEVEL=[2345]
+stop on runlevel [S016]
+
+respawn
+
+exec su -s /bin/sh -c "exec /usr/bin/ceilometer-agent-central --logfile /var/log/ceilometer/central.log" ceilometer
diff --git a/openstack-ceilometer-collector.init b/openstack-ceilometer-collector.init
new file mode 100644
index 0000000..8f798b9
--- /dev/null
+++ b/openstack-ceilometer-collector.init
@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+# openstack-ceilometer-collector OpenStack ceilometer collector Service
+#
+# chkconfig: - 98 02
+# description: OpenStack measurement and collection service collector
+
+### BEGIN INIT INFO
+# Provides:
+# Required-Start: $remote_fs $network $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Stop: 0 1 6
+# Short-Description: OpenStack ceilometer collector Server
+# Description: OpenStack measurement and collection service collector
+### END INIT INFO
+
+. /etc/rc.d/init.d/functions
+
+suffix=collector
+prog=openstack-ceilometer-$suffix
+exec="/usr/bin/ceilometer-$suffix"
+config="/etc/ceilometer/ceilometer.conf"
+pidfile="/var/run/ceilometer/ceilometer-$suffix.pid"
+logfile="/var/log/ceilometer/$suffix.log"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
+
+start() {
+ [ -x $exec ] || exit 5
+ [ -f $config ] || exit 6
+ echo -n $"Starting $prog: "
+ daemon --user ceilometer --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && touch $lockfile
+ return $retval
+}
+
+stop() {
+ echo -n $"Stopping $prog: "
+ killproc -p $pidfile $prog
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && rm -f $lockfile
+ return $retval
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ restart
+}
+
+force_reload() {
+ restart
+}
+
+rh_status() {
+ status -p $pidfile $prog
+}
+
+rh_status_q() {
+ rh_status >/dev/null 2>&1
+}
+
+
+case "$1" in
+ start)
+ rh_status_q && exit 0
+ $1
+ ;;
+ stop)
+ rh_status_q || exit 0
+ $1
+ ;;
+ restart)
+ $1
+ ;;
+ reload)
+ rh_status_q || exit 7
+ $1
+ ;;
+ force-reload)
+ force_reload
+ ;;
+ status)
+ rh_status
+ ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ exit 2
+esac
+exit $?
diff --git a/openstack-ceilometer-collector.upstart b/openstack-ceilometer-collector.upstart
new file mode 100644
index 0000000..fb6188b
--- /dev/null
+++ b/openstack-ceilometer-collector.upstart
@@ -0,0 +1,8 @@
+description "OpenStack Ceilometer collector service"
+
+start on stopped rc RUNLEVEL=[2345]
+stop on runlevel [S016]
+
+respawn
+
+exec su -s /bin/sh -c "exec /usr/bin/ceilometer-collector --logfile /var/log/ceilometer/collector.log" ceilometer
diff --git a/openstack-ceilometer-compute.init b/openstack-ceilometer-compute.init
new file mode 100644
index 0000000..6facfb0
--- /dev/null
+++ b/openstack-ceilometer-compute.init
@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+# openstack-ceilometer-compute OpenStack ceilometer compute node agent
+#
+# chkconfig: - 98 02
+# description: OpenStack measurement and collection service for running on compute nodes
+
+### BEGIN INIT INFO
+# Provides:
+# Required-Start: $remote_fs $network $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Stop: 0 1 6
+# Short-Description: OpenStack ceilometer compute node agent
+# Description: OpenStack measurement and collection service for running on compute nodes
+### END INIT INFO
+
+. /etc/rc.d/init.d/functions
+
+suffix=compute
+prog=openstack-ceilometer-$suffix
+exec="/usr/bin/ceilometer-agent-$suffix"
+config="/etc/ceilometer/ceilometer.conf"
+pidfile="/var/run/ceilometer/ceilometer-$suffix.pid"
+logfile="/var/log/ceilometer/$suffix.log"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
+
+start() {
+ [ -x $exec ] || exit 5
+ [ -f $config ] || exit 6
+ echo -n $"Starting $prog: "
+ daemon --user ceilometer --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && touch $lockfile
+ return $retval
+}
+
+stop() {
+ echo -n $"Stopping $prog: "
+ killproc -p $pidfile $prog
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && rm -f $lockfile
+ return $retval
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ restart
+}
+
+force_reload() {
+ restart
+}
+
+rh_status() {
+ status -p $pidfile $prog
+}
+
+rh_status_q() {
+ rh_status >/dev/null 2>&1
+}
+
+
+case "$1" in
+ start)
+ rh_status_q && exit 0
+ $1
+ ;;
+ stop)
+ rh_status_q || exit 0
+ $1
+ ;;
+ restart)
+ $1
+ ;;
+ reload)
+ rh_status_q || exit 7
+ $1
+ ;;
+ force-reload)
+ force_reload
+ ;;
+ status)
+ rh_status
+ ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ exit 2
+esac
+exit $?
diff --git a/openstack-ceilometer-compute.upstart b/openstack-ceilometer-compute.upstart
new file mode 100644
index 0000000..2a06de1
--- /dev/null
+++ b/openstack-ceilometer-compute.upstart
@@ -0,0 +1,8 @@
+description "OpenStack Ceilometer compute agent"
+
+start on stopped rc RUNLEVEL=[2345]
+stop on runlevel [S016]
+
+respawn
+
+exec su -s /bin/sh -c "exec /usr/bin/ceilometer-agent-compute --logfile /var/log/ceilometer/compute.log" ceilometer
diff --git a/openstack-ceilometer-newdeps.patch b/openstack-ceilometer-newdeps.patch
new file mode 100644
index 0000000..099a882
--- /dev/null
+++ b/openstack-ceilometer-newdeps.patch
@@ -0,0 +1,25 @@
+diff -Naur ceilometer-2014.1.b2.orig/ceilometer/__init__.py ceilometer-2014.1.b2/ceilometer/__init__.py
+--- ceilometer-2014.1.b2.orig/ceilometer/__init__.py 2014-01-23 14:55:44.000000000 +0000
++++ ceilometer-2014.1.b2/ceilometer/__init__.py 2014-01-27 15:03:39.691353920 +0000
+@@ -0,0 +1,21 @@
++import sys
++import pkg_resources
++
++# If there is a conflicting non egg module,
++# i.e. an older standard system module installed,
++# then replace it with this requirement
++def replace_dist(requirement):
++ try:
++ return pkg_resources.require(requirement)
++ except pkg_resources.VersionConflict:
++ e = sys.exc_info()[1]
++ dist=e.args[0]
++ req=e.args[1]
++ if dist.key == req.key and not dist.location.endswith('.egg'):
++ del pkg_resources.working_set.by_key[dist.key]
++ # We assume there is no need to adjust sys.path
++ # and the associated pkg_resources.working_set.entries
++ return pkg_resources.require(requirement)
++
++replace_dist("WebOb >= 1.2")
++replace_dist("SQLAlchemy >= 0.7.3")
diff --git a/openstack-ceilometer-notification.init b/openstack-ceilometer-notification.init
new file mode 100644
index 0000000..2695eca
--- /dev/null
+++ b/openstack-ceilometer-notification.init
@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+# openstack-ceilometer-notification OpenStack ceilometer notification agent
+#
+# chkconfig: - 98 02
+# description: OpenStack measurement and collection agent notification service
+
+### BEGIN INIT INFO
+# Provides:
+# Required-Start: $remote_fs $network $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Stop: 0 1 6
+# Short-Description: OpenStack ceilometer agent notification service
+# Description: OpenStack measurement collection agent notification service
+### END INIT INFO
+
+. /etc/rc.d/init.d/functions
+
+suffix=agent-notification
+prog=openstack-ceilometer-$suffix
+exec="/usr/bin/ceilometer-$suffix"
+config="/etc/ceilometer/ceilometer.conf"
+pidfile="/var/run/ceilometer/ceilometer-$suffix.pid"
+logfile="/var/log/ceilometer/$suffix.log"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
+
+start() {
+ [ -x $exec ] || exit 5
+ [ -f $config ] || exit 6
+ echo -n $"Starting $prog: "
+ daemon --user ceilometer --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && touch $lockfile
+ return $retval
+}
+
+stop() {
+ echo -n $"Stopping $prog: "
+ killproc -p $pidfile $prog
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && rm -f $lockfile
+ return $retval
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ restart
+}
+
+force_reload() {
+ restart
+}
+
+rh_status() {
+ status -p $pidfile $prog
+}
+
+rh_status_q() {
+ rh_status >/dev/null 2>&1
+}
+
+
+case "$1" in
+ start)
+ rh_status_q && exit 0
+ $1
+ ;;
+ stop)
+ rh_status_q || exit 0
+ $1
+ ;;
+ restart)
+ $1
+ ;;
+ reload)
+ rh_status_q || exit 7
+ $1
+ ;;
+ force-reload)
+ force_reload
+ ;;
+ status)
+ rh_status
+ ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ exit 2
+esac
+exit $?
diff --git a/openstack-ceilometer-notification.upstart b/openstack-ceilometer-notification.upstart
new file mode 100644
index 0000000..f12ad33
--- /dev/null
+++ b/openstack-ceilometer-notification.upstart
@@ -0,0 +1,8 @@
+description "OpenStack Ceilometer notification agent"
+
+start on stopped rc RUNLEVEL=[2345]
+stop on runlevel [S016]
+
+respawn
+
+exec su -s /bin/sh -c "exec /usr/bin/ceilometer-agent-notification --logfile /var/log/ceilometer/agent-notification.log" ceilometer
diff --git a/openstack-ceilometer.spec b/openstack-ceilometer.spec
index a17271f..5711b5a 100644
--- a/openstack-ceilometer.spec
+++ b/openstack-ceilometer.spec
@@ -4,7 +4,7 @@
Name: openstack-ceilometer
Version: 2014.2
-Release: 0.1.b2%{?dist}
+Release: 0.2.b2%{?dist}
Summary: OpenStack measurement collection service
Group: Applications/System
@@ -15,6 +15,22 @@ Source1: %{pypi_name}-dist.conf
Source2: %{pypi_name}.logrotate
Source3: %{pypi_name}.conf.sample
+%if 0%{?rhel} && 0%{?rhel} <= 6
+Source10: %{name}-api.init
+Source100: %{name}-api.upstart
+Source11: %{name}-collector.init
+Source110: %{name}-collector.upstart
+Source12: %{name}-compute.init
+Source120: %{name}-compute.upstart
+Source13: %{name}-central.init
+Source130: %{name}-central.upstart
+Source14: %{name}-alarm-notifier.init
+Source140: %{name}-alarm-notifier.upstart
+Source15: %{name}-alarm-evaluator.init
+Source150: %{name}-alarm-evaluator.upstart
+Source16: %{name}-notification.init
+Source160: %{name}-notification.upstart
+%else
Source10: %{name}-api.service
Source11: %{name}-collector.service
Source12: %{name}-compute.service
@@ -22,6 +38,7 @@ Source13: %{name}-central.service
Source14: %{name}-alarm-notifier.service
Source15: %{name}-alarm-evaluator.service
Source16: %{name}-notification.service
+%endif
#
# patches_base=2014.2.b2
@@ -35,6 +52,9 @@ BuildRequires: python-pbr
BuildRequires: python-d2to1
BuildRequires: python2-devel
+%if ! (0%{?rhel} && 0%{?rhel} <= 6)
+BuildRequires: systemd-units
+%endif
%description
OpenStack ceilometer provides services to measure and
@@ -84,9 +104,15 @@ Requires: openstack-utils
Requires: python-oslo-messaging
Requires: python-posix_ipc
+%if 0%{?rhel} && 0%{?rhel} <= 6
+Requires(post): chkconfig
+Requires(postun): initscripts
+Requires(preun): chkconfig
+%else
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
+%endif
Requires(pre): shadow-utils
@@ -282,6 +308,25 @@ install -p -D -m 640 etc/ceilometer/pipeline.yaml %{buildroot}%{_sysconfdir}/cei
install -p -D -m 640 etc/ceilometer/api_paste.ini %{buildroot}%{_sysconfdir}/ceilometer/api_paste.ini
# Install initscripts for services
+%if 0%{?rhel} && 0%{?rhel} <= 6
+install -p -D -m 755 %{SOURCE10} %{buildroot}%{_initrddir}/%{name}-api
+install -p -D -m 755 %{SOURCE11} %{buildroot}%{_initrddir}/%{name}-collector
+install -p -D -m 755 %{SOURCE12} %{buildroot}%{_initrddir}/%{name}-compute
+install -p -D -m 755 %{SOURCE13} %{buildroot}%{_initrddir}/%{name}-central
+install -p -D -m 755 %{SOURCE14} %{buildroot}%{_initrddir}/%{name}-alarm-notifier
+install -p -D -m 755 %{SOURCE15} %{buildroot}%{_initrddir}/%{name}-alarm-evaluator
+install -p -D -m 755 %{SOURCE16} %{buildroot}%{_initrddir}/%{name}-notification
+
+# Install upstart jobs examples
+install -d -m 755 %{buildroot}%{_datadir}/ceilometer
+install -p -m 644 %{SOURCE100} %{buildroot}%{_datadir}/ceilometer/
+install -p -m 644 %{SOURCE110} %{buildroot}%{_datadir}/ceilometer/
+install -p -m 644 %{SOURCE120} %{buildroot}%{_datadir}/ceilometer/
+install -p -m 644 %{SOURCE130} %{buildroot}%{_datadir}/ceilometer/
+install -p -m 644 %{SOURCE140} %{buildroot}%{_datadir}/ceilometer/
+install -p -m 644 %{SOURCE150} %{buildroot}%{_datadir}/ceilometer/
+install -p -m 644 %{SOURCE160} %{buildroot}%{_datadir}/ceilometer/
+%else
install -p -D -m 644 %{SOURCE10} %{buildroot}%{_unitdir}/%{name}-api.service
install -p -D -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/%{name}-collector.service
install -p -D -m 644 %{SOURCE12} %{buildroot}%{_unitdir}/%{name}-compute.service
@@ -289,10 +334,16 @@ install -p -D -m 644 %{SOURCE13} %{buildroot}%{_unitdir}/%{name}-central.service
install -p -D -m 644 %{SOURCE14} %{buildroot}%{_unitdir}/%{name}-alarm-notifier.service
install -p -D -m 644 %{SOURCE15} %{buildroot}%{_unitdir}/%{name}-alarm-evaluator.service
install -p -D -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/%{name}-notification.service
+%endif
# Install logrotate
install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+%if 0%{?rhel} && 0%{?rhel} <= 6
+# Install pid directory
+install -d -m 755 %{buildroot}%{_localstatedir}/run/ceilometer
+%endif
+
# Remove unneeded in production stuff
rm -f %{buildroot}%{_bindir}/ceilometer-debug
rm -fr %{buildroot}%{python_sitelib}/tests/
@@ -309,142 +360,212 @@ fi
exit 0
%post compute
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -eq 1 ] ; then
# Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /sbin/chkconfig --add %{name}-compute
fi
+%else
+%systemd_post
+%endif
%post collector
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -eq 1 ] ; then
# Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /sbin/chkconfig --add %{name}-collector
fi
+%else
+%systemd_post
+%endif
%post notification
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -eq 1 ] ; then
# Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /sbin/chkconfig --add %{name}-notification
fi
+%else
+%systemd_post
+%endif
%post api
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -eq 1 ] ; then
# Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /sbin/chkconfig --add %{name}-api
fi
+%else
+%systemd_post
+%endif
%post central
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -eq 1 ] ; then
# Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /sbin/chkconfig --add %{name}-central
fi
+%else
+%systemd_post
+%endif
%post alarm
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -eq 1 ] ; then
# Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ for svc in alarm-notifier alarm-evaluator; do
+ /sbin/chkconfig --add %{name}-${svc}
+ done
fi
+%else
+%systemd_post
+%endif
%preun compute
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -eq 0 ] ; then
for svc in compute; do
- /bin/systemctl --no-reload disable %{name}-${svc}.service > /dev/null 2>&1 || :
- /bin/systemctl stop %{name}-${svc}.service > /dev/null 2>&1 || :
+ /sbin/service %{name}-${svc} stop > /dev/null 2>&1
+ /sbin/chkconfig --del %{name}-${svc}
done
fi
+%else
+%systemd_preun {name}-compute.service
+%endif
%preun collector
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -eq 0 ] ; then
for svc in collector; do
- /bin/systemctl --no-reload disable %{name}-${svc}.service > /dev/null 2>&1 || :
- /bin/systemctl stop %{name}-${svc}.service > /dev/null 2>&1 || :
+ /sbin/service %{name}-${svc} stop > /dev/null 2>&1
+ /sbin/chkconfig --del %{name}-${svc}
done
fi
+%else
+%systemd_preun {name}-collector.service
+%endif
%preun notification
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -eq 0 ] ; then
for svc in notification; do
- /bin/systemctl --no-reload disable %{name}-${svc}.service > /dev/null 2>&1 || :
- /bin/systemctl stop %{name}-${svc}.service > /dev/null 2>&1 || :
+ /sbin/service %{name}-${svc} stop > /dev/null 2>&1
+ /sbin/chkconfig --del %{name}-${svc}
done
fi
+%else
+%systemd_preun {name}-notification.service
+%endif
%preun api
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -eq 0 ] ; then
for svc in api; do
- /bin/systemctl --no-reload disable %{name}-${svc}.service > /dev/null 2>&1 || :
- /bin/systemctl stop %{name}-${svc}.service > /dev/null 2>&1 || :
+ /sbin/service %{name}-${svc} stop > /dev/null 2>&1
+ /sbin/chkconfig --del %{name}-${svc}
done
fi
+%else
+%systemd_preun {name}-api.service
+%endif
%preun central
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -eq 0 ] ; then
for svc in central; do
- /bin/systemctl --no-reload disable %{name}-${svc}.service > /dev/null 2>&1 || :
- /bin/systemctl stop %{name}-${svc}.service > /dev/null 2>&1 || :
+ /sbin/service %{name}-${svc} stop > /dev/null 2>&1
+ /sbin/chkconfig --del %{name}-${svc}
done
fi
+%else
+%systemd_preun {name}-central.service
+%endif
%preun alarm
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -eq 0 ] ; then
for svc in alarm-notifier alarm-evaluator; do
- /bin/systemctl --no-reload disable %{name}-${svc}.service > /dev/null 2>&1 || :
- /bin/systemctl stop %{name}-${svc}.service > /dev/null 2>&1 || :
+ /sbin/service %{name}-${svc} stop > /dev/null 2>&1
+ /sbin/chkconfig --del %{name}-${svc}
done
fi
+%else
+%systemd_preun {name}-alarm-notifier.service
+%systemd_preun {name}-alarm-evaluator.service
+%endif
%postun compute
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
for svc in compute; do
- /bin/systemctl try-restart %{name}-${svc}.service >/dev/null 2>&1 || :
+ /sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || :
done
fi
+%else
+%systemd_postun_with_restart %{name}-compute.service
+%endif
%postun collector
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
for svc in collector; do
- /bin/systemctl try-restart %{name}-${svc}.service >/dev/null 2>&1 || :
+ /sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || :
done
fi
+%else
+%systemd_postun_with_restart %{name}-collector.service
+%endif
%postun notification
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
for svc in notification; do
- /bin/systemctl try-restart %{name}-${svc}.service >/dev/null 2>&1 || :
+ /sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || :
done
fi
+%else
+%systemd_postun_with_restart %{name}-notification.service
+%endif
%postun api
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
for svc in api; do
- /bin/systemctl try-restart %{name}-${svc}.service >/dev/null 2>&1 || :
+ /sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || :
done
fi
+%else
+%systemd_postun_with_restart %{name}-api.service
+%endif
%postun central
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
for svc in central; do
- /bin/systemctl try-restart %{name}-${svc}.service >/dev/null 2>&1 || :
+ /sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || :
done
fi
+%else
+%systemd_postun_with_restart %{name}-central.service
+%endif
%postun alarm
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%if 0%{?rhel} && 0%{?rhel} <= 6
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
for svc in alarm-notifier alarm-evaluator; do
- /bin/systemctl try-restart %{name}-${svc}.service >/dev/null 2>&1 || :
+ /sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || :
done
fi
+%else
+%systemd_postun_with_restart %{name}-alarm-notifier.service
+%systemd_postun_with_restart %{name}-alarm-evaluator.service
+%endif
%files common
@@ -458,6 +579,9 @@ fi
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%dir %attr(0755, ceilometer, root) %{_localstatedir}/log/ceilometer
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%dir %attr(0755, ceilometer, root) %{_localstatedir}/run/ceilometer
+%endif
%{_bindir}/ceilometer-dbsync
%{_bindir}/ceilometer-expirer
@@ -482,35 +606,72 @@ fi
%files compute
%{_bindir}/ceilometer-agent-compute
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{_initrddir}/%{name}-compute
+%{_datarootdir}/ceilometer/%{name}-compute.upstart
+%else
%{_unitdir}/%{name}-compute.service
+%endif
%files collector
%{_bindir}/ceilometer-collector*
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{_initrddir}/%{name}-collector
+%{_datarootdir}/ceilometer/%{name}-collector.upstart
+%else
%{_unitdir}/%{name}-collector.service
+%endif
+
%files notification
%{_bindir}/ceilometer-agent-notification
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{_initrddir}/%{name}-notification
+%{_datarootdir}/ceilometer/%{name}-notification.upstart
+%else
%{_unitdir}/%{name}-notification.service
+%endif
+
%files api
%{_bindir}/ceilometer-api
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{_initrddir}/%{name}-api
+%{_datarootdir}/ceilometer/%{name}-api.upstart
+%else
%{_unitdir}/%{name}-api.service
+%endif
%files central
%{_bindir}/ceilometer-agent-central
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{_initrddir}/%{name}-central
+%{_datarootdir}/ceilometer/%{name}-central.upstart
+%else
%{_unitdir}/%{name}-central.service
+%endif
%files alarm
%{_bindir}/ceilometer-alarm-notifier
%{_bindir}/ceilometer-alarm-evaluator
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{_initrddir}/%{name}-alarm-notifier
+%{_datarootdir}/ceilometer/%{name}-alarm-notifier.upstart
+%{_initrddir}/%{name}-alarm-evaluator
+%{_datarootdir}/ceilometer/%{name}-alarm-evaluator.upstart
+%else
%{_unitdir}/%{name}-alarm-notifier.service
%{_unitdir}/%{name}-alarm-evaluator.service
+%endif
%changelog
+* Mon Aug 18 2014 Nejc Saje <nsaje at redhat.com> 2014.2-0.2.b2
+- Merge epel6 and Fedora specfiles
+
* Fri Aug 01 2014 Nejc Saje <nsaje at redhat.com> 2014.2-0.1.b2
- Update to upstream 2014.2.b2
More information about the scm-commits
mailing list