Update ceilometer packages

- Update build and runtime dependencies according to mitaka
- Remove *-alarm package (now known as aodh package)

Change-Id: I75f486166f366714c1a659262985921fe2376a9b

diff --git a/centos7/rpm/SPECS/openstack-ceilometer.spec b/centos7/rpm/SPECS/openstack-ceilometer.spec
index 5a9dcbff0ee0d745813dd1a3654bfd0f034ab0d2..626fdf4d6a773a4d48bc2989ebd7085c6a107fe7 100644 (file)
--- a/centos7/rpm/SPECS/openstack-ceilometer.spec
+++ b/centos7/rpm/SPECS/openstack-ceilometer.spec
@@ -6,8 +6,8 @@ Name:             openstack-ceilometer
 # Liberty semver reset
 # https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z
 Epoch:            1
-Version:          5.0.0.0rc1
-Release:          1%{?dist}~mos8.0.1
+Version:          6.0.0.0rc1
+Release:          1%{?dist}
 Summary:          OpenStack measurement collection service
 
 Group:            Applications/System
@@ -24,11 +24,9 @@ Source10:         %{name}-api.service
 Source11:         %{name}-collector.service
 Source12:         %{name}-compute.service
 Source13:         %{name}-central.service
-Source14:         %{name}-alarm-notifier.service
-Source15:         %{name}-alarm-evaluator.service
-Source16:         %{name}-notification.service
-Source17:         %{name}-ipmi.service
-Source18:         %{name}-polling.service
+Source14:         %{name}-notification.service
+Source15:         %{name}-ipmi.service
+Source16:         %{name}-polling.service
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -56,7 +54,7 @@ Requires:         python-iso8601 >= 0.1.9
 Requires:         python-lxml >= 2.3
 Requires:         python-anyjson >= 0.3.3
 Requires:         python-jsonpath-rw >= 1.2.0
-Requires:         python-jsonpath-rw-ext >= 0.1.7
+Requires:         python-jsonpath-rw-ext >= 0.1.9
 Requires:         python-stevedore >= 1.5.0
 Requires:         python-msgpack >= 0.4.0
 Requires:         python-pbr >= 1.6
@@ -221,22 +219,6 @@ 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 = %{epoch}:%{version}-%{release}
-Requires:         python-ceilometerclient >= 1.5.0
-
-%description alarm
-OpenStack ceilometer provides services to measure and
-collect metrics from OpenStack components.
-
-This package contains the ceilometer alarm notification
-and evaluation services.
-
-
 %package ipmi
 Summary:          OpenStack ceilometer ipmi agent
 Group:            Applications/System
@@ -375,11 +357,9 @@ 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 -p -D -m 755 %{SOURCE16} %{buildroot}%{_initrddir}/%{name}-notification
-install -p -D -m 755 %{SOURCE17} %{buildroot}%{_initrddir}/%{name}-ipmi
-install -p -D -m 755 %{SOURCE18} %{buildroot}%{_initrddir}/%{name}-polling
+install -p -D -m 755 %{SOURCE14} %{buildroot}%{_initrddir}/%{name}-notification
+install -p -D -m 755 %{SOURCE15} %{buildroot}%{_initrddir}/%{name}-ipmi
+install -p -D -m 755 %{SOURCE16} %{buildroot}%{_initrddir}/%{name}-polling
 
 # Install upstart jobs examples
 install -d -m 755 %{buildroot}%{_datadir}/ceilometer
@@ -397,11 +377,9 @@ 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 644 %{SOURCE14} %{buildroot}%{_unitdir}/%{name}-alarm-notifier.service
-install -p -D -m 644 %{SOURCE15} %{buildroot}%{_unitdir}/%{name}-alarm-evaluator.service
-install -p -D -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/%{name}-notification.service
-install -p -D -m 644 %{SOURCE17} %{buildroot}%{_unitdir}/%{name}-ipmi.service
-install -p -D -m 644 %{SOURCE18} %{buildroot}%{_unitdir}/%{name}-polling.service
+install -p -D -m 644 %{SOURCE14} %{buildroot}%{_unitdir}/%{name}-notification.service
+install -p -D -m 644 %{SOURCE15} %{buildroot}%{_unitdir}/%{name}-ipmi.service
+install -p -D -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/%{name}-polling.service
 %endif
 
 # Install logrotate
@@ -437,9 +415,6 @@ exit 0
 %post central
 %systemd_post %{name}-central.service
 
-%post alarm
-%systemd_post %{name}-alarm-notifier.service %{name}-alarm-evaluator.service
-
 %post ipmi
 %systemd_post %{name}-alarm-ipmi.service
 
@@ -461,9 +436,6 @@ exit 0
 %preun central
 %systemd_preun %{name}-central.service
 
-%preun alarm
-%systemd_preun %{name}-alarm-notifier.service %{name}-alarm-evaluator.service
-
 %preun ipmi
 %systemd_preun %{name}-ipmi.service
 
@@ -485,9 +457,6 @@ exit 0
 %postun central
 %systemd_postun_with_restart %{name}-central.service
 
-%postun alarm
-%systemd_postun_with_restart %{name}-alarm-notifier.service %{name}-alarm-evaluator.service
-
 %postun ipmi
 %systemd_postun_with_restart %{name}-ipmi.service
 
@@ -553,14 +522,6 @@ exit 0
 %files central
 %{_unitdir}/%{name}-central.service
 
-
-%files alarm
-%{_bindir}/ceilometer-alarm-notifier
-%{_bindir}/ceilometer-alarm-evaluator
-%{_unitdir}/%{name}-alarm-notifier.service
-%{_unitdir}/%{name}-alarm-evaluator.service
-
-
 %files ipmi
 %config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/rootwrap.conf
 %config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/rootwrap.d/ipmi.filters
@@ -575,6 +536,10 @@ exit 0
 
 
 %changelog
+* Wed Mar 30 2016 Mikhail Ivanov <mivanov@mirantis.com> - 1:6.0.0.0rc1-1.el7
+- Update build and runtime dependencies according to mitaka
+- Remove *-alarm package (now known as aodh package)
+
 * Mon Sep 28 2015 Daniil Trishkin <dtrishkin@mirantis.com> - 1:5.0.0.0rc1-1%{?dist}~mos8.0.1
 - Update for Liberty
 - Update requirements according to global requirements of Liberty

diff --git a/tests/runtests.sh b/tests/runtests.sh
index ca20556ad84a7c6a91e0afa79260b5a1b1dfa493..a3a8229f9db0a1be605cac5d1eab28cd90b419df 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -65,7 +65,7 @@ if [[ `cat /etc/*-release | head -n 1 | awk '{print $1}'` =~ Ubuntu ]]; then
 else
    setenforce 0 && service firewalld stop
    os="centos"
-   packages_list="python-pip curl"
+   packages_list="curl python-pip"
    command_to_install="yum install -y"
    keystone_package="openstack-keystone"
    keystone_service="openstack-keystone"
@@ -79,7 +79,6 @@ else
       openstack-ceilometer-notification
       openstack-ceilometer-polling
       openstack-ceilometer-api
-      openstack-ceilometer-alarm
    )
    ceilometer_services=(
       openstack-ceilometer-central
@@ -249,10 +248,12 @@ send_fake_instance_notification() {
      python get-pip.py
    fi
 
-   pip install pika==0.9.8
+   pip install pika==0.10.0
    echo '#!/usr/bin/env python
 import pika
 import uuid
+import logging
+logging.basicConfig()
 connection = pika.BlockingConnection(pika.ConnectionParameters(host="127.0.0.1"))
 channel = connection.channel()
 channel.queue_declare(queue="notifications.info")

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index ed23502a5e5478b93912a0c074a1ea34dd62b010..439b4f3140e3d9e180e7915e1f74458ac7e2bc3b 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+ceilometer (1:6.0.0~rc1-2~u14.04+mos1) mos9.0; urgency=medium
+
+  * Bump revision 
+
+ -- Michael Ivanov <mivanov@mirantis.com>  Thu, 31 Mar 2016 17:43:05 +0300
+
 ceilometer (1:6.0.0~rc1-1~u14.04+mos1) mos9.0; urgency=medium
 
   * Update ceilometer to v6.0.0.0rc1