From 388af890ce100eb16f9ff1af27722099605d8f73 Mon Sep 17 00:00:00 2001 From: Sergey Otpuschennikov Date: Mon, 28 Oct 2013 15:30:48 +0400 Subject: [PATCH] New specs and patches Change-Id: I989076da838d1ec04d9466115c9da3e7e108a56a --- ...-t-access-the-net-when-building-docs.patch | 8 +- rpm/SOURCES/ceilometer-dist.conf | 2 +- .../openstack-ceilometer-alarm-evaluator.init | 102 ++++++++++++++++++ ...enstack-ceilometer-alarm-evaluator.upstart | 8 ++ .../openstack-ceilometer-alarm-notifier.init | 102 ++++++++++++++++++ ...penstack-ceilometer-alarm-notifier.upstart | 8 ++ rpm/SPECS/openstack-ceilometer.spec | 90 ++++++++++++++-- 7 files changed, 307 insertions(+), 13 deletions(-) create mode 100644 rpm/SOURCES/openstack-ceilometer-alarm-evaluator.init create mode 100644 rpm/SOURCES/openstack-ceilometer-alarm-evaluator.upstart create mode 100644 rpm/SOURCES/openstack-ceilometer-alarm-notifier.init create mode 100644 rpm/SOURCES/openstack-ceilometer-alarm-notifier.upstart diff --git a/rpm/SOURCES/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch b/rpm/SOURCES/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch index c6f5653..0a698ea 100644 --- a/rpm/SOURCES/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch +++ b/rpm/SOURCES/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch @@ -1,4 +1,4 @@ -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?= Date: Fri, 6 Jan 2012 12:16:34 +0000 Subject: [PATCH] Ensure we don't access the net when building docs @@ -11,10 +11,10 @@ Change-Id: I9d02fb4053a8106672aded1614a2850e21603eb2 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', @@ -22,7 +22,7 @@ index 9d01807..c89b701 100644 'sphinx.ext.todo', 'sphinxcontrib.autohttp.flask', 'wsmeext.sphinxext', -@@ -151,7 +150,6 @@ extensions = [ +@@ -152,7 +151,6 @@ extensions = [ 'sphinxcontrib.pecanwsme.rest', 'oslo.sphinx', ] diff --git a/rpm/SOURCES/ceilometer-dist.conf b/rpm/SOURCES/ceilometer-dist.conf index 7757175..ff72b86 100644 --- a/rpm/SOURCES/ceilometer-dist.conf +++ b/rpm/SOURCES/ceilometer-dist.conf @@ -3,4 +3,4 @@ log_dir = /var/log/ceilometer rpc_backend = ceilometer.openstack.common.rpc.impl_qpid [database] -connection = mysql://ceilometer:ceilometer@localhost/ceilometer +connection = mongodb://localhost:27017/ceilometer diff --git a/rpm/SOURCES/openstack-ceilometer-alarm-evaluator.init b/rpm/SOURCES/openstack-ceilometer-alarm-evaluator.init new file mode 100644 index 0000000..265576e --- /dev/null +++ b/rpm/SOURCES/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/rpm/SOURCES/openstack-ceilometer-alarm-evaluator.upstart b/rpm/SOURCES/openstack-ceilometer-alarm-evaluator.upstart new file mode 100644 index 0000000..c3d665d --- /dev/null +++ b/rpm/SOURCES/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/rpm/SOURCES/openstack-ceilometer-alarm-notifier.init b/rpm/SOURCES/openstack-ceilometer-alarm-notifier.init new file mode 100644 index 0000000..424e6ac --- /dev/null +++ b/rpm/SOURCES/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/rpm/SOURCES/openstack-ceilometer-alarm-notifier.upstart b/rpm/SOURCES/openstack-ceilometer-alarm-notifier.upstart new file mode 100644 index 0000000..9a92074 --- /dev/null +++ b/rpm/SOURCES/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/rpm/SPECS/openstack-ceilometer.spec b/rpm/SPECS/openstack-ceilometer.spec index dd3b5f2..7998873 100644 --- a/rpm/SPECS/openstack-ceilometer.spec +++ b/rpm/SPECS/openstack-ceilometer.spec @@ -4,13 +4,13 @@ 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 @@ -22,9 +22,13 @@ 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 # -# patches_base=2013.2.b3 +# patches_base=2013.2 # Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch @@ -43,7 +47,7 @@ BuildRequires: openstack-utils # 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 @@ -68,14 +72,15 @@ Requires: python-stevedore 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 @@ -175,6 +180,21 @@ collect metrics from OpenStack components. 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 @@ -260,6 +280,8 @@ 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 upstart jobs examples install -d -m 755 %{buildroot}%{_datadir}/ceilometer @@ -267,6 +289,8 @@ 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 logrotate install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} @@ -314,6 +338,14 @@ if [ $1 -eq 1 ] ; then /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 @@ -346,6 +378,14 @@ if [ $1 -eq 0 ] ; then 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 @@ -378,6 +418,15 @@ if [ $1 -ge 1 ] ; then 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 @@ -392,7 +441,9 @@ fi %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 @@ -417,7 +468,7 @@ fi %files collector -%{_bindir}/ceilometer-collector +%{_bindir}/ceilometer-collector* %{_initrddir}/%{name}-collector %{_datarootdir}/ceilometer/%{name}-collector.upstart @@ -435,7 +486,30 @@ fi %{_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 - 2013.2-1 +- Update to Havana release + +* Tue Oct 15 2013 Pádraig Brady - 2013.2-0.12.rc2 +- Update to Havana rc2 +- openstack-ceilometer-alarm now depends on python-ceilometerclient + +* Thu Oct 03 2013 Pádraig Brady - 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 - 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 - 2013.2-0.8.b3 - Depend on python-pymongo rather than pymongo to avoid a puppet bug -- 2.32.3