Hello community,
here is the log from the commit of package openstack-ceilometer for
openSUSE:Factory checked in at 2014-04-14 10:52:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-ceilometer (Old)
and /work/SRC/openSUSE:Factory/.openstack-ceilometer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-ceilometer"
Changes:
--------
---
/work/SRC/openSUSE:Factory/openstack-ceilometer/openstack-ceilometer-doc.changes
2013-12-10 16:03:19.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.openstack-ceilometer.new/openstack-ceilometer-doc.changes
2014-04-14 10:52:43.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Jan 8 15:27:19 UTC 2014 - [email protected]
+
+- Fix requirements
+
+-------------------------------------------------------------------
---
/work/SRC/openSUSE:Factory/openstack-ceilometer/openstack-ceilometer.changes
2014-01-30 17:41:20.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.openstack-ceilometer.new/openstack-ceilometer.changes
2014-04-14 10:52:44.000000000 +0200
@@ -2 +2,104 @@
-Thu Jan 30 01:18:33 UTC 2014 - [email protected]
+Tue Apr 1 09:23:11 UTC 2014 - [email protected]
+
+- Update to version 2014.1.rc1:
+ * Imported Translations from Transifex
+ * Use ConectionPool instead of one Connection in HBase
+ * remove dump tables from previous migrations
+ * De-dupe selectable aggregate list in statistics API
+ * improve performance of resource-list in sql
+ * SSL errors thrown with Postgres on multi workers
+ * Remove escape character in string format
+ * Verify user/project ID for alarm created by non-admin user
+ * enable a single worker by default
+ * Fix ceilometer.conf.sample mismatch
+ * Fix order of arguments in assertEquals
+ * Documenting hypervisor support for nova meters
+ * Ensure idempotency of cardinality reduction in mongo
+ * VMware vSphere: Improve the accuracy of queried samples
+ * Fix validation error for invalid field name in simple query
+ * fix create_or_update logic to avoid rollbacks
+ * Avoid swallowing AssertionError in test skipping logic
+ * Fix hardware pollster to inspect multiple resources
+ * spawn multiple workers in services
+ * Install global lazy _()
+ * Fixes Hyper-V metrics units
+ * Ensure intended indices on project_id are created for mongo
+ * Fix the type of the disk IO rate measurements
+ * Change the sample_type from tuple to string
+ * Fix order of arguments in assertEquals
+ * Ensure alarm rule conform to alarm type
+ * insecure flag added to novaclient
+ * Fixes duplicated names in alarm time constraints
+ * Eventlet monkeypatch must be done before anything
+ * 028 migration script incorrectly skips over section
+ * Fix bug in get_capabilities behavior in DB drivers
+ * Added documentation for selectable aggregates
+ * Make sure use IPv6 sockets for ceilometer in IPv6 environment
+ * VMware vSphere: Bug fixes
+ * Ensure insecure config option propagated by alarm evaluator
+ * Fix order of arguments in assertEquals
+ * Fix order of arguments in assertEquals
+ * Fix order of arguments in assertEquals
+ * Rationalize get_resources for mongodb
+ * Ensure insecure config option propagated by alarm service
+ * add host meters to doc
+ * Add field translation to complex query from OldSample to Sample
+ * Extend test case to cover old alarm style conversion
+ * Updated doc with debug instructions
+ * Corrected the sample names in hardware pollsters
+ * Make ceilometer work with sqla 0.9.x
+ * Implements monitoring-network-from-opendaylight
+ * Add user-supplied arguments in log_handler
+ * VMware vSphere support: Disk rates
+ * Fix updating alarm can specify existing alarm name
+ * Changes for networking metrics support for vSphere
+ * VMware vSphere: Changes for cpu_util
+ * VMware vSphere support: Memory Usage
+ * Fix broken statistics in sqlalchemy
+ * Fixes Hyper-V Inspector network metrics values
+ * Set storage engine for the trait_type table
+ * Enable monkeypatch for select module
+ * Rename id to alarm_id of Alarm in SqlAlchemy
+ * Fix some spelling mistakes and a incorrect url
+ * Skip central agent interval_task when keystone fails
+- Refreshed patches:
+ + 0001-Skip-tests-against-real-DB.patch (manually)
+
+-------------------------------------------------------------------
+Wed Mar 26 23:10:13 UTC 2014 - [email protected]
+
+- add requires to pysnmp
+
+-------------------------------------------------------------------
+Mon Mar 17 09:24:56 UTC 2014 - [email protected]
+
+- switch over to non-openstack-prefix'ed users
+
+-------------------------------------------------------------------
+Fri Mar 7 08:53:28 UTC 2014 - [email protected]
+
+- Change to version 2014.1.b3
+- Sync requirements from master
+
+-------------------------------------------------------------------
+Thu Mar 6 01:15:33 UTC 2014 - [email protected]
+
+- Update to version ceilometer-2014.1.dev261.g4d35b21:
+ * Per pipeline pluggable resource discovery
+ * VMware vSphere support: Performance Mgr APIs
+
+-------------------------------------------------------------------
+Wed Mar 5 01:28:14 UTC 2014 - [email protected]
+
+- Update to version ceilometer-2014.1.dev257.gbf2a745:
+ * Wider selection of aggregates for sqlalchemy
+ * Wider selection of aggregates for mongodb
+ * Adds time constraints to alarms
+ * Remove code duplication Part 3
+ * Decouple source and sink configuration for pipelines
+ * Selectable aggregate support in mongodb
+ * Selectable aggregation functions for statistics
+ * Add simple capabilities API
+
+-------------------------------------------------------------------
+Tue Mar 04 01:18:08 UTC 2014 - [email protected]
@@ -5 +108,219 @@
- + 0001-Skip-tests-against-real-DB.patch (only offset)
+ + remove-mysql-dependency.diff dropped (merged upstream)
+
+-------------------------------------------------------------------
+Tue Mar 4 01:18:06 UTC 2014 - [email protected]
+
+- Update to version ceilometer-2014.1.dev241.gcae5b17:
+ * Removed global state modification by api test
+ * move databases to test requirements
+ * Make recording and scanning data more determined
+ * Alarms support in HBase Part 2
+
+-------------------------------------------------------------------
+Mon Mar 3 11:35:47 UTC 2014 - [email protected]
+
+- Update to version ceilometer-2014.1.dev233.ga18d028:
+ * Fix typo on testing doc page
+
+-------------------------------------------------------------------
+Mon Mar 3 01:16:59 UTC 2014 - [email protected]
+
+- Update to version ceilometer-2014.1.dev231.gc60d2fa:
+ * Add comments for _build_paginate_query
+
+-------------------------------------------------------------------
+Sun Mar 2 01:34:52 UTC 2014 - [email protected]
+
+- Update to version ceilometer-2014.1.dev229.g9a159dd:
+ * Alarm support in HBase Part 1
+
+-------------------------------------------------------------------
+Sat Mar 1 01:05:18 UTC 2014 - [email protected]
+
+- Update to version ceilometer-2014.1.dev227.g77b6458:
+ * Implements "not" operator for complex query
+ * Implements metadata query for complex query feature
+ * Remove unused variable
+ * Added hardware pollsters for the central agent
+ * Added hardware agent's inspector and snmp implementation
+ * Updated from global requirements
+ * Pluggable resource discovery for agents
+ * Remove code duplication Part 2
+ * Imported Translations from Transifex
+
+-------------------------------------------------------------------
+Thu Feb 27 01:41:35 UTC 2014 - [email protected]
+
+- Update to version ceilometer-2014.1.dev209.gd75d969:
+ * remove audit logging on flush
+ * Set default log level of iso8601 to WARN
+ * Sync latest config file generator from oslo-incubator
+
+-------------------------------------------------------------------
+Wed Feb 26 01:40:49 UTC 2014 - [email protected]
+
+- Update to version ceilometer-2014.1.dev203.g9f60075:
+ * Tolerate absent recorded_at on older mongo/db2 samples
+ * api: export recorded_at in returned samples
+ * Fix the way how metadata is stored in HBase
+ * Remove code duplication
+ * sample table contains redundant/duplicate data
+ * rename meter table to sample
+ * Implements monitoring-network
+ * Implements in operator for complex query functionality
+
+-------------------------------------------------------------------
+Sat Feb 22 16:18:39 UTC 2014 - [email protected]
+
+- Update to version ceilometer-2014.1.dev189.g2f9300f:
+ * storage: store recording timestamp
+ * Fixed spelling error in Ceilometer
+ * Updated from global requirements
+ * Remove code that works around a (now-resolved) bug in pecan
+ * Fix missing source field content on /v2/samples API
+
+-------------------------------------------------------------------
+Fri Feb 21 08:39:14 UTC 2014 - [email protected]
+
+- use root-owned dir for pidfiles
+
+-------------------------------------------------------------------
+Fri Feb 21 01:01:03 UTC 2014 - [email protected]
+
+- Update to version ceilometer-2014.1.dev180.g168e0e3:
+ * Refactor timestamp existence validation in V2 API
+ * Implements field validation for complex query functionality
+ * allow hacking to set dependencies
+ * Fix some flaws in ceilometer docstrings
+ * Fix recursive_keypairs output
+
+-------------------------------------------------------------------
++++ 721 more lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/openstack-ceilometer/openstack-ceilometer.changes
++++ and
/work/SRC/openSUSE:Factory/.openstack-ceilometer.new/openstack-ceilometer.changes
Old:
----
0001-enable-sql-metadata-query.patch
ceilometer-stable-havana.tar.gz
New:
----
ceilometer-2014.1.rc1.tar.gz
openstack-ceilometer.conf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-ceilometer-doc.spec ++++++
--- /var/tmp/diff_new_pack.ZJXlh0/_old 2014-04-14 10:52:45.000000000 +0200
+++ /var/tmp/diff_new_pack.ZJXlh0/_new 2014-04-14 10:52:45.000000000 +0200
@@ -19,13 +19,13 @@
%define component ceilometer
Name: openstack-%{component}-doc
-Version: 2013.2.2.dev6.g16eb199
+Version: 2014.1.rc1
Release: 0
Summary: OpenStack Metering (Ceilometer) - Documentation
License: Apache-2.0
Group: Documentation/HTML
Url: http://openstack.org/projects/compute/
-Source: ceilometer-stable-havana.tar.gz
+Source:
http://tarballs.openstack.org/ceilometer/ceilometer-%{version}.tar.gz
BuildRequires: openstack-suse-macros
BuildRequires: python-Babel
BuildRequires: python-Flask
@@ -36,7 +36,7 @@
BuildRequires: python-WebOb
BuildRequires: python-anyjson >= 0.3.1
BuildRequires: python-argparse
-BuildRequires: python-d2to1
+BuildRequires: python-croniter >= 0.3.4
BuildRequires: python-eventlet
BuildRequires: python-glance
BuildRequires: python-iso8601
@@ -49,9 +49,10 @@
BuildRequires: python-nova
BuildRequires: python-novaclient
BuildRequires: python-oslo.config
-BuildRequires: python-oslo.sphinx
+BuildRequires: python-oslosphinx
BuildRequires: python-pbr
BuildRequires: python-pecan
+BuildRequires: python-sphinxcontrib-docbookrestapi
BuildRequires: python-sphinxcontrib-httpdomain
BuildRequires: python-sphinxcontrib-pecanwsme
BuildRequires: python-stevedore >= 0.6
@@ -70,7 +71,7 @@
This package contains documentation files for openstack-ceilometer.
%prep
-%setup -q -n ceilometer-2013.2.2.dev6.g16eb199
+%setup -q -n ceilometer-%{version}
%openstack_cleanup_prep
sed -i "s|'sphinxcontrib.autohttp.flask',||" doc/source/conf.py
++++++ openstack-ceilometer.spec ++++++
--- /var/tmp/diff_new_pack.ZJXlh0/_old 2014-04-14 10:52:45.000000000 +0200
+++ /var/tmp/diff_new_pack.ZJXlh0/_new 2014-04-14 10:52:45.000000000 +0200
@@ -18,32 +18,33 @@
%define component ceilometer
-%define groupname openstack-%{component}
-%define username openstack-%{component}
+%define groupname %{component}
+%define username %{component}
Name: openstack-%{component}
-Version: 2013.2.2.dev6.g16eb199
+Version: 2014.1.rc1
Release: 0
Summary: OpenStack Metering (Ceilometer)
License: Apache-2.0
Group: System/Management
Url: https://launchpad.net/ceilometer
-Source: ceilometer-stable-havana.tar.gz
+Source:
http://tarballs.openstack.org/ceilometer/ceilometer-%{version}.tar.gz
Source1: %{name}.init
Source2: %{name}.logrotate
Source9: org.openstack.ceilometer.pkla
+%if 0%{?suse_version} > 1230
+Source10: %name.conf
+BuildRequires: systemd
+%endif
Source13: openstack-ceilometer-polkit.rules
# PATCH-FIX-SUSE: Skip testing against DB2 and Mongodb
Patch0: 0001-Skip-tests-against-real-DB.patch
-Patch1: 0001-enable-sql-metadata-query.patch
BuildRequires: crudini
BuildRequires: fdupes
BuildRequires: openstack-suse-macros
BuildRequires: python-base
-BuildRequires: python-d2to1
-BuildRequires: python-distribute
BuildRequires: python-happybase >= 0.4
-BuildRequires: python-pbr
+BuildRequires: python-pbr >= 0.6
%if 0%{?suse_version} > 1110
# to make orphaned-file-tests happy
BuildRequires: polkit-default-privs
@@ -54,7 +55,7 @@
Requires: logrotate
Requires: python >= 2.6.8
Requires: python-ceilometer = %{version}
-Requires: python-pbr >= 0.5.21
+Requires: python-pbr >= 0.6
%if 0%{?suse_version} > 1110
Requires(pre): pwdutils
%else
@@ -83,30 +84,35 @@
Requires: python-Flask >= 0.10
Requires: python-PyYAML >= 3.1.0
Requires: python-SQLAlchemy >= 0.7.8
-Requires: python-WSME >= 0.5b5
+Requires: python-WSME >= 0.6
Requires: python-WebOb >= 1.2.3
Requires: python-alembic >= 0.4.1
Requires: python-anyjson >= 0.3.3
-Requires: python-argparse
-Requires: python-ceilometerclient >= 1.0.5
+Requires: python-ceilometerclient >= 1.0.6
+Requires: python-croniter >= 0.3.4
Requires: python-eventlet >= 0.13.0
Requires: python-glanceclient >= 0.9.0
Requires: python-happybase >= 0.4
Requires: python-iso8601 >= 0.1.8
-Requires: python-keystoneclient >= 0.3.2
+Requires: python-jsonpath-rw >= 1.2.0
+Requires: python-jsonschema >= 2.0.0
+Requires: python-keystoneclient >= 0.6.0
Requires: python-kombu >= 2.4.8
+Requires: python-lockfile >= 0.8
Requires: python-lxml >= 2.3
Requires: python-msgpack-python
-Requires: python-netaddr
Requires: python-novaclient >= 2.15.0
Requires: python-oslo.config >= 1.2.0
-Requires: python-pecan >= 0.2.0
+Requires: python-oslo.vmware
+Requires: python-pecan >= 0.4.5
Requires: python-pymongo >= 2.4
+Requires: python-pysnmp >= 4.2.1
+Requires: python-pytz >= 2010h
Requires: python-requests >= 1.1
-Requires: python-six >= 1.4.1
-Requires: python-sqlalchemy-migrate >= 0.7.2
-Requires: python-stevedore >= 0.10
-Requires: python-swiftclient >= 1.5
+Requires: python-six >= 1.5.2
+Requires: python-sqlalchemy-migrate >= 0.8.2
+Requires: python-stevedore >= 0.14
+Requires: python-swiftclient >= 1.6
%description -n python-ceilometer
This package contains the core Python module of %{name}.
@@ -133,7 +139,7 @@
Requires: %{name} = %{version}
%description agent-central
-This package contains the %{name} agent central.
+This package contains the %{name} central agent.
%package agent-compute
Summary: OpenStack Metering (Ceilometer) - Agent Compute
@@ -141,7 +147,15 @@
Requires: %{name} = %{version}
%description agent-compute
-This package contains the %{name} agent compute.
+This package contains the %{name} compute agent.
+
+%package agent-notification
+Summary: OpenStack Metering (Ceilometer) - Agent Notification
+Group: Development/Languages/Python
+Requires: %{name} = %{version}
+
+%description agent-notification
+This package contains the %{name} notification agent.
%package alarm-evaluator
Summary: OpenStack Metering (Ceilometer) - Alarm Evaluator
@@ -163,35 +177,34 @@
Summary: OpenStack Metering (Ceilometer) - Testsuite
Group: Development/Languages/Python
Requires: %{name} = %{version}
-Requires: openstack-nova-test
-Requires: python-coverage >= 3.6
+Requires: openstack-ceilometer-agent-central = %{version}
+Requires: openstack-ceilometer-agent-compute = %{version}
+Requires: openstack-ceilometer-api = %{version}
+Requires: openstack-ceilometer-collector = %{version}
+Requires: openstack-nova-test >= 2014.1
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
Requires: python-discover
%endif
+Requires: python-MySQL-python
Requires: python-fixtures >= 0.3.14
-Requires: python-flake8 >= 2.0
Requires: python-glance
-Requires: python-hacking >= 0.5.6
-Requires: python-httplib2
+Requires: python-httplib2 >= 0.7.5
Requires: python-mock >= 1.0
Requires: python-mox >= 0.5.3
Requires: python-nova
-Requires: python-pep8 >= 1.4.5
-Requires: python-pyflakes >= 0.7.2
-Requires: python-python-subunit
-Requires: python-sphinxcontrib-pecanwsme >= 0.5
+Requires: python-python-subunit >= 0.0.18
+Requires: python-sphinxcontrib-pecanwsme >= 0.6
Requires: python-swift
-Requires: python-testrepository >= 0.0.17
+Requires: python-testrepository >= 0.0.18
Requires: python-testscenarios >= 0.4
-Requires: python-testtools >= 0.9.32
+Requires: python-testtools >= 0.9.34
%description test
This package contains testsuite files for %{name}.
%prep
-%setup -q -n ceilometer-2013.2.2.dev6.g16eb199
+%setup -q -n %{component}-%{version}
%patch0 -p1
-%patch1 -p1
%openstack_cleanup_prep
%build
@@ -206,7 +219,11 @@
### directories
#TODO: Check what we need:
install -d -m 755 %{buildroot}%{_localstatedir}/{lib,log}/%{component}
-install -d -m 750 %{buildroot}%{_localstatedir}/{lock,cache,run}/%{component}
+install -d -m 750 %{buildroot}%{_localstatedir}/{cache}/%{component}
+install -d -m 700 %{buildroot}%{_localstatedir}/run/%{component}
+%if 0%{?suse_version} > 1230
+install -D -m 644 %{SOURCE10} %{buildroot}/%_tmpfilesdir/%name.conf
+%endif
### configuration files
install -d -m 0755 %{buildroot}%{_sysconfdir}/%{component}
@@ -219,7 +236,7 @@
### init scripts
mkdir -p %{buildroot}%{_initddir}
mkdir -p %{buildroot}%{_sbindir}
-for i in api collector collector-udp agent-central agent-compute
alarm-evaluator alarm-notifier ; do
+for i in api collector agent-central agent-compute agent-notification
alarm-evaluator alarm-notifier ; do
tmp=$(mktemp)
cat %{SOURCE1} | sed "s/__NAME__/$i/g" > $tmp
install -m 755 $tmp %{buildroot}%{_initddir}/%{name}-$i
@@ -242,25 +259,23 @@
### test subpackage
%openstack_test_package_install
# Skip functional tests that require mongodb
-rm
%{buildroot}/var/lib/openstack-%{component}-test/tests/storage/test_impl_mongodb.py
\
-
%{buildroot}/var/lib/openstack-%{component}-test/tests/api/v2/test_statistics_scenarios.py
+rm
%{buildroot}%{python_sitelib}/ceilometer/tests/{storage/test_impl_mongodb.py*,api/v2/test_statistics_scenarios.py*}
### set default configuration (mostly applies to package-only setups and
quickstart, i.e. not generally crowbar)
%define ceilometer_conf
%{buildroot}%{_sysconfdir}/%{component}/%{component}.conf
crudini --set %{ceilometer_conf} DEFAULT verbose True
#NOTE(saschpe): Don't set 'log_file', each ceilometer deamon will create it's
own if only 'log_dir' is set:
crudini --set %{ceilometer_conf} DEFAULT log_dir
%{_localstatedir}/log/%{component}
-crudini --set %{ceilometer_conf} DEFAULT lock_path
%{_localstatedir}/lock/%{component}
-crudini --set %{ceilometer_conf} keystone_authtoken signing_dir
/var/cache/%component/keystone-signing
crudini --set %{ceilometer_conf} DEFAULT policy_file
%{_sysconfdir}/%{component}/policy.json
+crudini --set %{ceilometer_conf} DEFAULT lock_path
%{_localstatedir}/run/%{component}
+crudini --set %{ceilometer_conf} keystone_authtoken signing_dir
/var/cache/%component/keystone-signing
+crudini --set %{ceilometer_conf} database connection
sqlite:////var/lib/ceilometer/ceilometer.db
### authentication cache dir
mkdir -p %{buildroot}%{_localstatedir}/cache/ceilometer
%pre
-getent group %{groupname} >/dev/null || groupadd -r %{groupname}
-getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d
%{_localstatedir}/lib/%{component} -s /sbin/nologin -c "OpenStack Ceilometer
Daemons" %{username}
-exit 0
+%openstack_pre_user_group_create %{username} %{groupname}
%post api
%{fillup_and_insserv -f openstack-ceilometer-api}
@@ -323,10 +338,21 @@
%restart_on_update openstack-ceilometer-alarm-notifier
%insserv_cleanup
+%post agent-notification
+%{fillup_and_insserv -f openstack-ceilometer-agent-notification}
+
+%preun agent-notification
+%stop_on_removal openstack-ceilometer-agent-notification
+
+%postun agent-notification
+%restart_on_update openstack-ceilometer-agent-notification
+%insserv_cleanup
+
%files
%defattr(-,root,root)
%doc README.rst
%{_bindir}/ceilometer-dbsync
+%{_bindir}/ceilometer-send-sample
%dir %{_sysconfdir}/%{component}
%config(noreplace) %attr(0640, root, %{groupname})
%{_sysconfdir}/%{component}/%{component}.conf
%config %{_sysconfdir}/%{component}/pipeline.yaml
@@ -335,9 +361,13 @@
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/lib/%{component}
%dir %attr(0750, %{username}, %{groupname})
%{_localstatedir}/cache/%{component}
-%dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/lock/%{component}
%dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/log/%{component}
-%ghost %dir %attr(0750, %{username}, %{groupname})
%{_localstatedir}/run/%{component}
+%if 0%{?suse_version} > 1230
+%ghost %dir %attr(700,%{username},%{groupname})
%{_localstatedir}/run/%{component}
+%_tmpfilesdir/%name.conf
+%else
+%dir %attr(0700, %{username}, %{groupname}) %{_localstatedir}/run/%{component}
+%endif
%files -n python-ceilometer
%defattr(-,root,root,-)
@@ -355,11 +385,8 @@
%files collector
%defattr(-,root,root,-)
%{_initddir}/%{name}-collector
-%{_initddir}/%{name}-collector-udp
%{_sbindir}/rc%{name}-collector
-%{_sbindir}/rc%{name}-collector-udp
%{_bindir}/%{component}-collector
-%{_bindir}/%{component}-collector-udp
%{_bindir}/%{component}-expirer
%files agent-central
@@ -380,6 +407,12 @@
%{_datadir}/polkit-1/rules.d/11-openstack-ceilometer.rules
%endif
+%files agent-notification
+%defattr(-,root,root,-)
+%{_initddir}/%{name}-agent-notification
+%{_sbindir}/rc%{name}-agent-notification
+%{_bindir}/%{component}-agent-notification
+
%files alarm-evaluator
%defattr(-,root,root,-)
%{_initddir}/%{name}-alarm-evaluator
++++++ 0001-Skip-tests-against-real-DB.patch ++++++
--- /var/tmp/diff_new_pack.ZJXlh0/_old 2014-04-14 10:52:45.000000000 +0200
+++ /var/tmp/diff_new_pack.ZJXlh0/_new 2014-04-14 10:52:45.000000000 +0200
@@ -1,32 +1,8 @@
-From af83706391477fc8bd16e592a7fc1b0132dbe3bb Mon Sep 17 00:00:00 2001
-From: Dirk Mueller <[email protected]>
-Date: Fri, 27 Sep 2013 22:59:17 +0200
-Subject: [PATCH] Skip tests against real DB
-
-Change-Id: I0f00d423205f251e9d670eca93708929caa06cdf
----
- ceilometer/tests/db.py | 3 ---
- tests/api/v2/test_app.py | 11 +----------
- tests/api/v2/test_statistics_scenarios.py | 5 +----
- 3 files changed, 2 insertions(+), 17 deletions(-)
-
-Index: ceilometer-2013.2.2.dev6.g16eb199/ceilometer/tests/db.py
+Index: ceilometer-2014.1.rc1/ceilometer/tests/api/v2/test_app.py
===================================================================
---- ceilometer-2013.2.2.dev6.g16eb199.orig/ceilometer/tests/db.py
-+++ ceilometer-2013.2.2.dev6.g16eb199/ceilometer/tests/db.py
-@@ -83,7 +83,4 @@ class MixinTestsWithBackendScenarios(obj
-
- scenarios = [
- ('sqlalchemy', dict(database_connection='sqlite://')),
-- ('mongodb', dict(database_connection=MongoDBFakeConnectionUrl())),
-- ('hbase', dict(database_connection='hbase://__test__')),
-- ('db2', dict(database_connection=DB2FakeConnectionUrl())),
- ]
-Index: ceilometer-2013.2.2.dev6.g16eb199/tests/api/v2/test_app.py
-===================================================================
---- ceilometer-2013.2.2.dev6.g16eb199.orig/tests/api/v2/test_app.py
-+++ ceilometer-2013.2.2.dev6.g16eb199/tests/api/v2/test_app.py
-@@ -66,19 +66,10 @@ class TestApp(base.TestCase):
+--- ceilometer-2014.1.rc1.orig/ceilometer/tests/api/v2/test_app.py
++++ ceilometer-2014.1.rc1/ceilometer/tests/api/v2/test_app.py
+@@ -74,19 +74,10 @@ class TestApp(base.BaseTestCase):
os.unlink(tmpfile)
@@ -36,7 +12,7 @@
- def test_pecan_extension_guessing_unset(self):
- # check Pecan does not assume .jpg is an extension
- response = self.app.get(self.PATH_PREFIX + '/meters/meter.jpg')
-- self.assertEqual(response.content_type, 'application/json')
+- self.assertEqual('application/json', response.content_type)
-
-
class TestApiMiddleware(FunctionalTest):
@@ -47,19 +23,31 @@
no_lang_translated_error = 'No lang translated error'
en_US_translated_error = 'en-US translated error'
-Index:
ceilometer-2013.2.2.dev6.g16eb199/tests/api/v2/test_statistics_scenarios.py
+Index:
ceilometer-2014.1.rc1/ceilometer/tests/api/v2/test_statistics_scenarios.py
===================================================================
----
ceilometer-2013.2.2.dev6.g16eb199.orig/tests/api/v2/test_statistics_scenarios.py
-+++ ceilometer-2013.2.2.dev6.g16eb199/tests/api/v2/test_statistics_scenarios.py
-@@ -1234,10 +1234,7 @@ class TestGroupBySource(base.FunctionalT
+---
ceilometer-2014.1.rc1.orig/ceilometer/tests/api/v2/test_statistics_scenarios.py
++++ ceilometer-2014.1.rc1/ceilometer/tests/api/v2/test_statistics_scenarios.py
+@@ -1228,10 +1228,7 @@ class TestGroupBySource(FunctionalTest,
# tests.
scenarios = [
- ('mongodb',
- dict(database_connection=tests_db.MongoDBFakeConnectionUrl())),
-- ('hbase', dict(database_connection='hbase://__test__')),
+- ('hbase',
dict(database_connection=tests_db.HBaseFakeConnectionUrl())),
- ('db2', dict(database_connection=tests_db.DB2FakeConnectionUrl())),
+ ('sqlalchemy', dict(database_connection='sqlite://'))
]
PATH = '/meters/instance/statistics'
+Index: ceilometer-2014.1.rc1/ceilometer/tests/db.py
+===================================================================
+--- ceilometer-2014.1.rc1.orig/ceilometer/tests/db.py
++++ ceilometer-2014.1.rc1/ceilometer/tests/db.py
+@@ -116,7 +116,4 @@ class MixinTestsWithBackendScenarios(obj
+
+ scenarios = [
+ ('sqlalchemy', dict(database_connection='sqlite://')),
+- ('mongodb', dict(database_connection=MongoDBFakeConnectionUrl())),
+- ('hbase', dict(database_connection=HBaseFakeConnectionUrl())),
+- ('db2', dict(database_connection=DB2FakeConnectionUrl())),
+ ]
++++++ _service ++++++
--- /var/tmp/diff_new_pack.ZJXlh0/_old 2014-04-14 10:52:45.000000000 +0200
+++ /var/tmp/diff_new_pack.ZJXlh0/_new 2014-04-14 10:52:45.000000000 +0200
@@ -1,11 +1,13 @@
<services>
- <service name="git_tarballs" mode="disabled">
- <param
name="url">http://tarballs.openstack.org/ceilometer/ceilometer-stable-havana.tar.gz</param>
- <param name="email">[email protected]</param>
- <param name="plain-version">True</param>
+ <service mode="disabled" name="download_files">
+ <param name="changesgenerate">enable</param>
+ </service>
+ <service mode="disabled" name="set_version">
+ <param name="basename">ceilometer</param>
</service>
-
<service name="refresh_patches" mode="disabled">
<param name="changesgenerate">enable</param>
</service>
+ <service name="python_requires" mode="disabled">
+ </service>
</services>
++++++ openstack-ceilometer-polkit.rules ++++++
--- /var/tmp/diff_new_pack.ZJXlh0/_old 2014-04-14 10:52:45.000000000 +0200
+++ /var/tmp/diff_new_pack.ZJXlh0/_new 2014-04-14 10:52:45.000000000 +0200
@@ -1,8 +1,8 @@
-// grant nova-compute libvirt management permissions
+// grant ceilometer libvirt management permissions
polkit.addRule(function(action, subject) {
if (action.id == "org.libvirt.unix.monitor" &&
- subject.user == "openstack-ceilometer") {
+ subject.user == "ceilometer") {
return polkit.Result.YES;
}
});
++++++ openstack-ceilometer.conf ++++++
d /var/run/openstack-ceilometer 0700 ceilometer ceilometer -
++++++ openstack-ceilometer.init ++++++
--- /var/tmp/diff_new_pack.ZJXlh0/_old 2014-04-14 10:52:45.000000000 +0200
+++ /var/tmp/diff_new_pack.ZJXlh0/_new 2014-04-14 10:52:45.000000000 +0200
@@ -13,9 +13,10 @@
### END INIT INFO
DAEMON="__NAME__"
-USER="openstack-ceilometer"
+USER="ceilometer"
CONFFILE="/etc/ceilometer/ceilometer.conf"
RUNDIR="/var/run/ceilometer"
+PIDFILE="/var/run/$DAEMON.pid"
LOGFILE="/var/log/ceilometer/$DAEMON.log"
# $RUNDIR can be tmpfs, thus we have to create/own it here:
@@ -28,18 +29,19 @@
start)
if [ "$DAEMON" == "api" ]; then
echo -n "Checking DB Migrations for ceilometer"
- test -f /var/log/ceilometer/ceilometer-dbsync.log && chown $USER.
/var/log/ceilometer/ceilometer-dbsync.log
su $USER -s /bin/sh -c "ceilometer-dbsync --config-file=$CONFFILE"
> /dev/null
rc_status -v
fi
echo -n "Starting ceilometer-$DAEMON"
- /sbin/startproc -s -u $USER -t ${STARTUP_TIMEOUT:-5} -q
/usr/bin/ceilometer-$DAEMON --config-file=$CONFFILE --logfile=$LOGFILE
+ /sbin/startproc -s -p $PIDFILE -u $USER -t ${STARTUP_TIMEOUT:-5} -q
/usr/bin/ceilometer-$DAEMON --config-file=$CONFFILE --logfile=$LOGFILE
+ /sbin/pidof -x /usr/bin/ceilometer-$DAEMON > $PIDFILE
rc_status -v
;;
stop)
echo -n "Shutting down ceilometer-$DAEMON"
- /sbin/killproc /usr/bin/ceilometer-$DAEMON
+ /sbin/killproc -p $PIDFILE /usr/bin/ceilometer-$DAEMON
+ rm -f $PIDFILE
rc_status -v
;;
restart)
@@ -51,7 +53,7 @@
;;
status)
echo -n "Checking ceilometer-$DAEMON"
- /sbin/checkproc /usr/bin/ceilometer-$DAEMON
+ /sbin/checkproc -p $PIDFILE /usr/bin/ceilometer-$DAEMON
rc_status -v
;;
condrestart|try-restart)
++++++ openstack-ceilometer.logrotate ++++++
--- /var/tmp/diff_new_pack.ZJXlh0/_old 2014-04-14 10:52:45.000000000 +0200
+++ /var/tmp/diff_new_pack.ZJXlh0/_new 2014-04-14 10:52:45.000000000 +0200
@@ -7,7 +7,7 @@
dateext
missingok
notifempty
- su openstack-ceilometer openstack-ceilometer
+ su ceilometer ceilometer
copytruncate
sharedscripts
}
++++++ org.openstack.ceilometer.pkla ++++++
--- /var/tmp/diff_new_pack.ZJXlh0/_old 2014-04-14 10:52:45.000000000 +0200
+++ /var/tmp/diff_new_pack.ZJXlh0/_new 2014-04-14 10:52:45.000000000 +0200
@@ -1,5 +1,5 @@
-[Grant openstack-ceilometer libvirt monitor permissions]
-Identity=unix-user:openstack-ceilometer
+[Grant ceilometer libvirt monitor permissions]
+Identity=unix-user:ceilometer
Action=org.libvirt.unix.monitor
ResultAny=yes
ResultInactive=yes
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
