[openstack-ceilometer/el6-grizzly: 1/2] adjust for el6
Pádraig Brady
pbrady at fedoraproject.org
Tue Apr 9 03:36:13 UTC 2013
commit 984604ffe102175fc0864edca3ffbfa8fcfcacf9
Author: Pádraig Brady <P at draigBrady.com>
Date: Sun Apr 7 03:42:27 2013 +0100
adjust for el6
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 | 50 +++++++++++++++
openstack-ceilometer.spec | 104 +++++++++++++++++++-------------
10 files changed, 553 insertions(+), 41 deletions(-)
---
diff --git a/openstack-ceilometer-api.init b/openstack-ceilometer-api.init
new file mode 100644
index 0000000..913ae66
--- /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 --config-file $config --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..7cde214
--- /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 --config-file /etc/ceilometer/ceilometer.conf --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..366d74a
--- /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 --config-file $config --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..390935c
--- /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 --config-file /etc/ceilometer/ceilometer.conf --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..9dca492
--- /dev/null
+++ b/openstack-ceilometer-collector.init
@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+# openstack-ceilometer-collector OpenStack ceilometer collector Server
+#
+# chkconfig: - 98 02
+# description: OpenStack measurement and collection service collector 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 collector Server
+# Description: OpenStack measurement and collection service collector agent
+### 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 --config-file $config --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..bd6ee43
--- /dev/null
+++ b/openstack-ceilometer-collector.upstart
@@ -0,0 +1,8 @@
+description "OpenStack Ceilometer collector agent"
+
+start on stopped rc RUNLEVEL=[2345]
+stop on runlevel [S016]
+
+respawn
+
+exec su -s /bin/sh -c "exec /usr/bin/ceilometer-collector --config-file /etc/ceilometer/ceilometer.conf --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..25e578a
--- /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 --config-file $config --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..7d65b2b
--- /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 --config-file /etc/ceilometer/ceilometer.conf --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..ae8994f
--- /dev/null
+++ b/openstack-ceilometer-newdeps.patch
@@ -0,0 +1,50 @@
+diff -Naur ceilometer-2013.1.g3.orig/ceilometer/__init__.py ceilometer-2013.1.g3/ceilometer/__init__.py
+--- ceilometer-2013.1.g3.orig/ceilometer/__init__.py 2013-04-08 09:54:04.545469160 +0000
++++ ceilometer-2013.1.g3/ceilometer/__init__.py 2013-04-08 10:01:12.306302227 +0000
+@@ -14,6 +14,28 @@
+ # under the License.
+ #
+
++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")
++
+ import gettext
+
+ gettext.install('ceilometer', unicode=1)
+diff -Naur ceilometer-2013.1.g3.orig/ceilometer/storage/sqlalchemy/migration.py ceilometer-2013.1.g3/ceilometer/storage/sqlalchemy/migration.py
+--- ceilometer-2013.1.g3.orig/ceilometer/storage/sqlalchemy/migration.py 2013-04-08 09:54:04.608469135 +0000
++++ ceilometer-2013.1.g3/ceilometer/storage/sqlalchemy/migration.py 2013-04-08 10:06:21.515180041 +0000
+@@ -52,7 +52,13 @@
+
+
+ # NOTE(jkoelker) Delay importing migrate until we are patched
+-from migrate import exceptions as versioning_exceptions
++try:
++ # Try the more specific path first (migrate <= 0.6)
++ from migrate.versioning import exceptions as versioning_exceptions
++except ImportError:
++ # Use the newer path (migrate >= 0.7)
++ from migrate import exceptions as versioning_exceptions
++
+ from migrate.versioning import api as versioning_api
+ from migrate.versioning.repository import Repository
+
diff --git a/openstack-ceilometer.spec b/openstack-ceilometer.spec
index 799883b..f395506 100644
--- a/openstack-ceilometer.spec
+++ b/openstack-ceilometer.spec
@@ -14,10 +14,14 @@ Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-2013.1
Source1: %{pypi_name}.conf
Source2: %{pypi_name}.logrotate
-Source10: %{name}-api.service
-Source11: %{name}-collector.service
-Source12: %{name}-compute.service
-Source13: %{name}-central.service
+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
#
# patches_base=grizzly-3
@@ -25,14 +29,21 @@ Source13: %{name}-central.service
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
Patch0002: 0002-add-LICENSE.patch
+# This is EL6 specific and not upstream
+Patch100: openstack-ceilometer-newdeps.patch
+
BuildArch: noarch
BuildRequires: intltool
-BuildRequires: python-sphinx
+BuildRequires: python-sphinx10
BuildRequires: python-setuptools
BuildRequires: python2-devel
BuildRequires: openstack-utils
+# These are required to build due to the requirements check added
+BuildRequires: python-sqlalchemy0.7
+BuildRequires: python-webob1.2
+
%description
OpenStack ceilometer provides services to measure and
@@ -54,10 +65,10 @@ Requires: python-lxml
Requires: python-anyjson
Requires: python-stevedore
-Requires: python-sqlalchemy
+Requires: python-sqlalchemy0.7
Requires: python-migrate
-Requires: python-webob
+Requires: python-webob >= 1.2
Requires: python-oslo-config
Requires: PyYAML
@@ -75,9 +86,9 @@ Group: Applications/System
Requires: python-ceilometer = %{version}-%{release}
Requires: openstack-utils
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): chkconfig
+Requires(postun): initscripts
+Requires(preun): chkconfig
Requires(pre): shadow-utils
@@ -166,7 +177,7 @@ Group: Documentation
# Required to build module documents
BuildRequires: python-eventlet
-BuildRequires: python-sqlalchemy
+BuildRequires: python-sqlalchemy0.7
BuildRequires: python-webob
# while not strictly required, quiets the build down when building docs.
BuildRequires: python-migrate, python-iso8601
@@ -184,6 +195,9 @@ This package contains documentation files for ceilometer.
%patch0001 -p1
%patch0002 -p1
+# Apply EL6 patch
+%patch100 -p1
+
find . \( -name .gitignore -o -name .placeholder \) -delete
find ceilometer -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
@@ -203,7 +217,7 @@ export PYTHONPATH="$( pwd ):$PYTHONPATH"
pushd doc
%if 0%{?with_doc}
-SPHINX_DEBUG=1 sphinx-build -b html source build/html
+SPHINX_DEBUG=1 sphinx-1.0-build -b html source build/html
# Fix hidden-file-or-dir warnings
rm -fr build/html/.doctrees build/html/.buildinfo
%endif
@@ -223,10 +237,17 @@ install -p -D -m 640 etc/ceilometer/sources.json %{buildroot}%{_sysconfdir}/ceil
install -p -D -m 640 etc/ceilometer/pipeline.yaml %{buildroot}%{_sysconfdir}/ceilometer/pipeline.yaml
# Install initscripts for services
-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
-install -p -D -m 644 %{SOURCE13} %{buildroot}%{_unitdir}/%{name}-central.service
+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 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 logrotate
install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
@@ -250,92 +271,88 @@ exit 0
%post compute
if [ $1 -eq 1 ] ; then
# Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /sbin/chkconfig --add %{name}-compute
fi
%post collector
if [ $1 -eq 1 ] ; then
# Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /sbin/chkconfig --add %{name}-collector
fi
%post api
if [ $1 -eq 1 ] ; then
# Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /sbin/chkconfig --add %{name}-api
fi
%post central
if [ $1 -eq 1 ] ; then
# Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /sbin/chkconfig --add %{name}-central
fi
%preun compute
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
%preun collector
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
%preun api
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
%preun central
if [ $1 -eq 0 ] ; then
for svc in agent; 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
%postun compute
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
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
%postun collector
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
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
%postun api
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
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
%postun central
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
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
@@ -350,6 +367,7 @@ fi
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%dir %attr(0755, ceilometer, root) %{_localstatedir}/log/ceilometer
+%dir %attr(0755, ceilometer, root) %{_localstatedir}/run/ceilometer
%{_bindir}/ceilometer-*
@@ -371,25 +389,29 @@ fi
%files compute
%{_bindir}/ceilometer-agent-compute
-%{_unitdir}/%{name}-compute.service
+%{_initrddir}/%{name}-compute
+%{_datarootdir}/ceilometer/%{name}-compute.upstart
%files collector
%{_bindir}/ceilometer-collector
-%{_unitdir}/%{name}-collector.service
+%{_initrddir}/%{name}-collector
+%{_datarootdir}/ceilometer/%{name}-collector.upstart
%files api
%doc ceilometer/api/v1/static/LICENSE.*
%{_bindir}/ceilometer-api
-%{_unitdir}/%{name}-api.service
+%{_initrddir}/%{name}-api
+%{_datarootdir}/ceilometer/%{name}-api.upstart
%files central
%{_bindir}/ceilometer-agent-central
-%{_unitdir}/%{name}-central.service
+%{_initrddir}/%{name}-central
+%{_datarootdir}/ceilometer/%{name}-central.upstart
%changelog
-* Tue Mar 26 2013 Pádraig Brady <P at draigBrady.com> - 2013.1-0.5.g3
+* Sat Apr 7 2013 Pádraig Brady <P at draigBrady.com> - 2013.1-0.5.g3
- Initial package
More information about the scm-commits
mailing list