-From 405a372272ff73c21bf91aedebfe2afb74b83e9d Mon Sep 17 00:00:00 2001
+From 4e1c90bcccaa5bfd78a8bd3fd1bef1c578fe586a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady@redhat.com>
Date: Fri, 6 Jan 2012 12:16:34 +0000
Subject: [PATCH] Ensure we don't access the net when building docs
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 9d01807..c89b701 100644
+index 98646df..c561497 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
-@@ -141,7 +141,6 @@ write_autodoc_index()
+@@ -142,7 +142,6 @@ write_autodoc_index()
# or your custom ones.
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.todo',
'sphinxcontrib.autohttp.flask',
'wsmeext.sphinxext',
-@@ -151,7 +150,6 @@ extensions = [
+@@ -152,7 +151,6 @@ extensions = [
'sphinxcontrib.pecanwsme.rest',
'oslo.sphinx',
]
--- /dev/null
+#!/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 $?
--- /dev/null
+#!/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 $?
Name: openstack-ceilometer
Version: 2013.2
-Release: 0.8.b3%{?dist}
+Release: 1%{?dist}
Summary: OpenStack measurement collection service
Group: Applications/System
License: ASL 2.0
URL: https://wiki.openstack.org/wiki/Ceilometer
-Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.b3.tar.gz
+Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
Source1: %{pypi_name}-dist.conf
Source2: %{pypi_name}.logrotate
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
#
-# patches_base=2013.2.b3
+# patches_base=2013.2
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
# These are required to build due to the requirements check added
BuildRequires: python-sqlalchemy0.7
-BuildRequires: python-webob1.2
+BuildRequires: python-webob >= 1.2
%description
Requires: python-msgpack
Requires: python-netaddr
Requires: python-six
+Requires: PyYAML
Requires: python-sqlalchemy0.7
Requires: python-alembic
Requires: python-migrate
Requires: python-webob >= 1.2
-Requires: python-oslo-config
-Requires: PyYAML
+
+Requires: python-oslo-config >= 1:1.2.0
%description -n python-ceilometer
OpenStack ceilometer provides services to measure and
This package contains the ceilometer API service.
+%package alarm
+Summary: OpenStack ceilometer alarm services
+Group: Applications/System
+
+Requires: %{name}-common = %{version}-%{release}
+Requires: python-ceilometerclient
+
+%description alarm
+OpenStack ceilometer provides services to measure and
+collect metrics from OpenStack components.
+
+This package contains the ceilometer alarm notification
+and evaluation services.
+
+
%if 0%{?with_doc}
%package doc
Summary: Documentation for OpenStack ceilometer
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 upstart jobs examples
install -d -m 755 %{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 logrotate
install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
/sbin/chkconfig --add %{name}-central
fi
+%post alarm
+if [ $1 -eq 1 ] ; then
+ # Initial installation
+ for svc in alarm-notifier alarm-evaluator; do
+ /sbin/chkconfig --add %{name}-${svc}
+ done
+fi
+
%preun compute
if [ $1 -eq 0 ] ; then
for svc in compute; do
done
fi
+%preun alarm
+if [ $1 -eq 0 ] ; then
+ for svc in alarm-notifier alarm-evaluator; do
+ /sbin/service %{name}-${svc} stop > /dev/null 2>&1
+ /sbin/chkconfig --del %{name}-${svc}
+ done
+fi
+
%postun compute
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
done
fi
+%postun alarm
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ for svc in alarm-notifier alarm-evaluator; do
+ /sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || :
+ done
+fi
+
%files common
%doc LICENSE
%dir %attr(0755, ceilometer, root) %{_localstatedir}/log/ceilometer
%dir %attr(0755, ceilometer, root) %{_localstatedir}/run/ceilometer
-%{_bindir}/ceilometer-*
+%{_bindir}/ceilometer-dbsync
+%{_bindir}/ceilometer-expirer
+
%defattr(-, ceilometer, ceilometer, -)
%dir %{_sharedstatedir}/ceilometer
%files collector
-%{_bindir}/ceilometer-collector
+%{_bindir}/ceilometer-collector*
%{_initrddir}/%{name}-collector
%{_datarootdir}/ceilometer/%{name}-collector.upstart
%{_datarootdir}/ceilometer/%{name}-central.upstart
+%files alarm
+%{_bindir}/ceilometer-alarm-notifier
+%{_bindir}/ceilometer-alarm-evaluator
+%{_initrddir}/%{name}-alarm-notifier
+%{_datarootdir}/ceilometer/%{name}-alarm-notifier.upstart
+%{_initrddir}/%{name}-alarm-evaluator
+%{_datarootdir}/ceilometer/%{name}-alarm-evaluator.upstart
+
+
%changelog
+* Thu Oct 17 2013 Pádraig Brady <pbrady@redhat.com> - 2013.2-1
+- Update to Havana release
+
+* Tue Oct 15 2013 Pádraig Brady <pbrady@redhat.com> - 2013.2-0.12.rc2
+- Update to Havana rc2
+- openstack-ceilometer-alarm now depends on python-ceilometerclient
+
+* Thu Oct 03 2013 Pádraig Brady <pbrady@redhat.com> - 2013.2-0.12.rc1
+- Update to Havana rc1
+- Separate out the new alarm services to the 'alarm' subpackage
+
+* Fri Sep 13 2013 Pádraig Brady <pbrady@redhat.com> - 2013.2-0.10.b3
+- Depend on python-oslo-config >= 1:1.2.0 so it upgraded automatically
+
* Mon Sep 10 2013 Pádraig Brady <pbrady@redhat.com> - 2013.2-0.8.b3
- Depend on python-pymongo rather than pymongo to avoid a puppet bug