[openstack-ceilometer/el6-icehouse] update to Icehouse milestone 1
Pádraig Brady
pbrady at fedoraproject.org
Tue Dec 24 11:11:14 UTC 2013
commit 9ba740c59bd708fe70a6b6d078b4b2d521914a06
Author: Pádraig Brady <P at draigBrady.com>
Date: Mon Dec 16 14:29:00 2013 +0000
update to Icehouse milestone 1
.gitignore | 9 +--
...e-don-t-access-the-net-when-building-docs.patch | 2 +-
openstack-ceilometer-agent-notification.init | 102 ++++++++++++++++++++
openstack-ceilometer-agent-notification.service | 12 +++
openstack-ceilometer-agent-notification.upstart | 8 ++
openstack-ceilometer-newdeps.patch | 18 ----
openstack-ceilometer.spec | 26 ++++--
sources | 2 +-
8 files changed, 143 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c034d58..f55724a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1 @@
-/ceilometer-2013.1.g3.tar.gz
-/ceilometer-2013.1.tar.gz
-/ceilometer-2013.2.b1.tar.gz
-/ceilometer-2013.2.b3.tar.gz
-/ceilometer-2013.2.rc1.tar.gz
-/ceilometer-2013.2.rc2.tar.gz
-/ceilometer-2013.2.tar.gz
-/ceilometer-2013.2.1.tar.gz
+/ceilometer-2014.1.b1.tar.gz
diff --git a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
index fa1d6b6..95fe9a2 100644
--- a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -1,4 +1,4 @@
-From c8a8664ed40a26520ecef85f098530c54d07f556 Mon Sep 17 00:00:00 2001
+From 8be4bd1971ac7fd797027f24d2b96bb7009a3133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Fri, 6 Jan 2012 12:16:34 +0000
Subject: [PATCH] Ensure we don't access the net when building docs
diff --git a/openstack-ceilometer-agent-notification.init b/openstack-ceilometer-agent-notification.init
new file mode 100644
index 0000000..84738fb
--- /dev/null
+++ b/openstack-ceilometer-agent-notification.init
@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+# openstack-ceilometer-agent-notification OpenStack ceilometer agent notification service
+#
+# 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-agent-notification.service b/openstack-ceilometer-agent-notification.service
new file mode 100644
index 0000000..f7c4872
--- /dev/null
+++ b/openstack-ceilometer-agent-notification.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=OpenStack ceilometer agent notification service
+After=syslog.target network.target
+
+[Service]
+Type=simple
+User=ceilometer
+ExecStart=/usr/bin/ceilometer-agent-notification --logfile /var/log/ceilometer/agent-notification.log
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/openstack-ceilometer-agent-notification.upstart b/openstack-ceilometer-agent-notification.upstart
new file mode 100644
index 0000000..11fa4c5
--- /dev/null
+++ b/openstack-ceilometer-agent-notification.upstart
@@ -0,0 +1,8 @@
+description "OpenStack Ceilometer agent notification service"
+
+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-newdeps.patch b/openstack-ceilometer-newdeps.patch
index dc9f441..495988d 100644
--- a/openstack-ceilometer-newdeps.patch
+++ b/openstack-ceilometer-newdeps.patch
@@ -27,21 +27,3 @@ diff -Naur ceilometer-2013.2.b1.orig/ceilometer/__init__.py ceilometer-2013.2.b1
+
+replace_dist("WebOb >= 1.2")
+replace_dist("SQLAlchemy >= 0.7.3")
-diff -Naur ceilometer-2013.2.b1.orig/ceilometer/storage/sqlalchemy/migration.py ceilometer-2013.2.b1/ceilometer/storage/sqlalchemy/migration.py
---- ceilometer-2013.2.b1.orig/ceilometer/storage/sqlalchemy/migration.py 2013-05-30 15:09:28.000000000 +0000
-+++ ceilometer-2013.2.b1/ceilometer/storage/sqlalchemy/migration.py 2013-05-31 16:03:43.209551099 +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 bbc1e71..8452310 100644
--- a/openstack-ceilometer.spec
+++ b/openstack-ceilometer.spec
@@ -3,14 +3,14 @@
%global pypi_name ceilometer
Name: openstack-ceilometer
-Version: 2013.2.1
-Release: 1%{?dist}
+Version: 2014.1
+Release: 0.1.b1%{?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}.tar.gz
+Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.b1.tar.gz
Source1: %{pypi_name}-dist.conf
Source2: %{pypi_name}.logrotate
@@ -26,9 +26,11 @@ Source14: %{name}-alarm-notifier.init
Source140: %{name}-alarm-notifier.upstart
Source15: %{name}-alarm-evaluator.init
Source150: %{name}-alarm-evaluator.upstart
+Source16: %{name}-agent-notification.init
+Source160: %{name}-agent-notification.upstart
#
-# patches_base=2013.2.1
+# patches_base=2014.1.b1
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -68,6 +70,7 @@ Requires: python-greenlet
Requires: python-iso8601
Requires: python-lxml
Requires: python-anyjson
+Requires: python-jsonpath-rw
Requires: python-stevedore
Requires: python-msgpack
Requires: python-netaddr
@@ -171,7 +174,7 @@ Requires: %{name}-common = %{version}-%{release}
Requires: python-pymongo
Requires: python-flask
Requires: python-pecan
-Requires: python-wsme
+Requires: python-wsme >= 0.5b6
%description api
OpenStack ceilometer provides services to measure and
@@ -215,7 +218,7 @@ This package contains documentation files for ceilometer.
%endif
%prep
-%setup -q -n ceilometer-%{version}
+%setup -q -n ceilometer-%{version}.b1
%patch0001 -p1
@@ -282,6 +285,7 @@ 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}-agent-notification
# Install upstart jobs examples
install -d -m 755 %{buildroot}%{_datadir}/ceilometer
@@ -291,6 +295,7 @@ 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/
# Install logrotate
install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
@@ -356,7 +361,7 @@ fi
%preun collector
if [ $1 -eq 0 ] ; then
- for svc in collector; do
+ for svc in collector agent-notification; do
/sbin/service %{name}-${svc} stop > /dev/null 2>&1
/sbin/chkconfig --del %{name}-${svc}
done
@@ -397,7 +402,7 @@ fi
%postun collector
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
- for svc in collector; do
+ for svc in collector agent-notification; do
/sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || :
done
fi
@@ -470,7 +475,9 @@ fi
%files collector
%{_bindir}/ceilometer-collector*
%{_initrddir}/%{name}-collector
+%{_initrddir}/%{name}-agent-notification
%{_datarootdir}/ceilometer/%{name}-collector.upstart
+%{_datarootdir}/ceilometer/%{name}-agent-notification.upstart
%files api
@@ -496,6 +503,9 @@ fi
%changelog
+* Mon Dec 23 2013 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.1.b1
+- Update to Icehouse milestone 1
+
* Tue Dec 17 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2.1-1
- Update to Havana stable release 2013.2.1
diff --git a/sources b/sources
index d7a33b9..9449e80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39af989dc8feec8ab54c3e775a78e48d ceilometer-2013.2.1.tar.gz
+ea0a072b641d4d04c3dfd3ef2bcf178d ceilometer-2014.1.b1.tar.gz
More information about the scm-commits
mailing list