[openstack-ceilometer/el6-icehouse] split out openstack-ceilometer-notification subpackage from collector

[Pádraig Brady]

commit de1a236056f43c55988168bee45d51c6a37215c1
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Apr 11 13:07:31 2014 +0100

    split out openstack-ceilometer-notification subpackage from collector
    
    This is not to minimize dependencies, more so to avoid confusion
    with the conceptually different collector and notification agent
    services. See commit 592f74b for more details.

 openstack-ceilometer.spec |   58 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 6 deletions(-)
---
diff --git a/openstack-ceilometer.spec b/openstack-ceilometer.spec
index b091c19..d8f2e1c 100644
--- a/openstack-ceilometer.spec
+++ b/openstack-ceilometer.spec
@@ -155,18 +155,38 @@ This package contains the central ceilometer agent.
 
 
 %package collector
-Summary:          OpenStack ceilometer collector agent
+Summary:          OpenStack ceilometer collector
 Group:            Applications/System
 
 Requires:         %{name}-common = %{version}-%{release}
 
+# For compat with older provisioning tools.
+# Remove when all reference the notification package explicitly
+Requires:         %{name}-notification
+
 Requires:         python-pymongo
 
 %description collector
 OpenStack ceilometer provides services to measure and
 collect metrics from OpenStack components.
 
-This package contains the ceilometer collector agent.
+This package contains the ceilometer collector service
+which collects metrics from the various agents.
+
+
+%package notification
+Summary:          OpenStack ceilometer notification agent
+Group:            Applications/System
+
+Requires:         %{name}-common = %{version}-%{release}
+
+%description notification
+OpenStack ceilometer provides services to measure and
+collect metrics from OpenStack components.
+
+This package contains the ceilometer notification agent
+which pushes metrics to the collector service from the
+various OpenStack services.
 
 
 %package api
@@ -335,6 +355,12 @@ if [ $1 -eq 1 ] ; then
     /sbin/chkconfig --add %{name}-collector
 fi
 
+%post notification
+if [ $1 -eq 1 ] ; then
+    # Initial installation
+    /sbin/chkconfig --add %{name}-notification
+fi
+
 %post api
 if [ $1 -eq 1 ] ; then
     # Initial installation
@@ -365,7 +391,15 @@ fi
 
 %preun collector
 if [ $1 -eq 0 ] ; then
-    for svc in collector notification; do
+    for svc in collector; do
+        /sbin/service %{name}-${svc} stop > /dev/null 2>&1
+        /sbin/chkconfig --del %{name}-${svc}
+    done
+fi
+
+%preun notification
+if [ $1 -eq 0 ] ; then
+    for svc in notification; do
         /sbin/service %{name}-${svc} stop > /dev/null 2>&1
         /sbin/chkconfig --del %{name}-${svc}
     done
@@ -406,7 +440,15 @@ fi
 %postun collector
 if [ $1 -ge 1 ] ; then
     # Package upgrade, not uninstall
-    for svc in collector notification; do
+    for svc in collector; do
+        /sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || :
+    done
+fi
+
+%postun notification
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    for svc in notification; do
         /sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || :
     done
 fi
@@ -479,10 +521,13 @@ fi
 
 %files collector
 %{_bindir}/ceilometer-collector*
-%{_bindir}/ceilometer-agent-notification
 %{_initrddir}/%{name}-collector
-%{_initrddir}/%{name}-notification
 %{_datarootdir}/ceilometer/%{name}-collector.upstart
+
+
+%files notification
+%{_bindir}/ceilometer-agent-notification
+%{_initrddir}/%{name}-notification
 %{_datarootdir}/ceilometer/%{name}-notification.upstart
 
 
@@ -511,6 +556,7 @@ fi
 %changelog
 * Fri Apr 11 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.7.rc1
 - Remove qpid as default rpc backend
+- Split out openstack-ceilometer-notification subpackage from collector
 
 * Mon Mar 31 2014 Pádraig Brady <P at draigBrady.com> 2014.1-0.6.rc1
 - Update to upstream 2014.1.rc1