[openstack-ceilometer] Update to upstream 2014.2.rc2
Alan Pevec
apevec at fedoraproject.org
Fri Oct 10 23:32:18 UTC 2014
commit 6a7ad5e144ffa4e2ce22a71187b3eba83da45a60
Author: Alan Pevec <alan.pevec at redhat.com>
Date: Sat Oct 11 00:40:16 2014 +0200
Update to upstream 2014.2.rc2
update dependencies
update conf sample
.gitignore | 2 +
ceilometer.conf.sample | 386 ++++++++++++++++++++++++++++++---------------
openstack-ceilometer.spec | 27 +++-
sources | 2 +-
4 files changed, 284 insertions(+), 133 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7911176..61fadd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@
/ceilometer-2014.1.1.tar.gz
/ceilometer-2014.2.b2.tar.gz
/ceilometer-2014.2.b3.tar.gz
+/ceilometer-2014.2.rc1.tar.gz
+/ceilometer-2014.2.rc2.tar.gz
diff --git a/ceilometer.conf.sample b/ceilometer.conf.sample
index fef4c4a..34bb687 100644
--- a/ceilometer.conf.sample
+++ b/ceilometer.conf.sample
@@ -14,10 +14,6 @@
# Size of RPC connection pool. (integer value)
#rpc_conn_pool_size=30
-# Modules of exceptions that are permitted to be recreated
-# upon receiving exception data from an rpc call. (list value)
-#allowed_rpc_exception_modules=oslo.messaging.exceptions,nova.exception,cinder.exception,exceptions
-
# Qpid broker hostname. (string value)
#qpid_hostname=localhost
@@ -47,6 +43,10 @@
# Whether to disable the Nagle algorithm. (boolean value)
#qpid_tcp_nodelay=true
+# The number of prefetched messages held by receiver. (integer
+# value)
+#qpid_receiver_capacity=1
+
# The qpid topology version to use. Version 1 is what was
# originally used by impl_qpid. Version 2 includes some
# backwards-incompatible changes that allow broker federation
@@ -156,15 +156,6 @@
# Heartbeat time-to-live. (integer value)
#matchmaker_heartbeat_ttl=600
-# Host to locate redis. (string value)
-#host=127.0.0.1
-
-# Use this port to connect to redis host. (integer value)
-#port=6379
-
-# Password for Redis server (optional). (string value)
-#password=<None>
-
# Size of RPC greenthread pool. (integer value)
#rpc_thread_pool_size=64
@@ -249,6 +240,15 @@
#
+# Options defined in ceilometer.utils
+#
+
+# Path to the rootwrap configuration file touse for running
+# commands as root (string value)
+#rootwrap_config=/etc/ceilometer/rootwrap.conf
+
+
+#
# Options defined in ceilometer.api.app
#
@@ -300,19 +300,20 @@
#
-# Options defined in ceilometer.dispatcher
+# Options defined in ceilometer.data_processing.notifications
#
-# Dispatcher to process data. (multi valued)
-#dispatcher=database
+# Exchange name for Data Processing notifications (string
+# value)
+#sahara_control_exchange=sahara
#
-# Options defined in ceilometer.hardware.notifications.ipmi
+# Options defined in ceilometer.dispatcher
#
-# Exchange name for Ironic notifications. (string value)
-#ironic_exchange=ironic
+# Dispatcher to process data. (multi valued)
+#dispatcher=database
#
@@ -324,6 +325,17 @@
#
+# Options defined in ceilometer.image.glance
+#
+
+# Number of items to request in each paginated Glance API
+# request (parameter used by glancecelient). If this is less
+# than or equal to 0, page size is not specified (default
+# value in glanceclient is used). (integer value)
+#glance_page_size=0
+
+
+#
# Options defined in ceilometer.image.notifications
#
@@ -332,6 +344,14 @@
#
+# Options defined in ceilometer.ipmi.notifications.ironic
+#
+
+# Exchange name for Ironic notifications. (string value)
+#ironic_exchange=ironic
+
+
+#
# Options defined in ceilometer.network.notifications
#
@@ -407,7 +427,7 @@
#logging_exception_prefix=%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s
# List of logger=LEVEL pairs. (list value)
-#default_log_levels=amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN
+#default_log_levels=amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN
# Enables or disables publication of error events. (boolean
# value)
@@ -470,16 +490,6 @@
#
-# Options defined in ceilometer.openstack.common.middleware.sizelimit
-#
-
-# The maximum body size for each request, in bytes. (integer
-# value)
-# Deprecated group/name - [DEFAULT]/osapi_max_request_body_size
-#max_request_body_size=114688
-
-
-#
# Options defined in ceilometer.openstack.common.policy
#
@@ -500,6 +510,14 @@
#
+# Options defined in ceilometer.profiler.notifications
+#
+
+# Exchange name for DBaaS notifications (string value)
+#trove_control_exchange=trove
+
+
+#
# Options defined in ceilometer.storage
#
@@ -544,7 +562,10 @@
#notifier_rpc_topic=alarm_notifier
# The topic that ceilometer uses for alarm partition
-# coordination messages. (string value)
+# coordination messages. DEPRECATED: RPC-based
+# partitionedalarm evaluation service will be removed in Kilo
+# in favour of the default alarm evaluation service using tooz
+# for partitioning. (string value)
#partition_rpc_topic=alarm_partition_coordination
@@ -566,13 +587,23 @@
# Record alarm change events. (boolean value)
#record_history=true
+# Maximum number of alarms defined for a user. (integer value)
+#user_alarm_quota=<None>
+
+# Maximum number of alarms defined for a project. (integer
+# value)
+#project_alarm_quota=<None>
+
#
# Options defined in ceilometer.cmd.alarm
#
-# Class to launch as alarm evaluation service. (string value)
-#evaluation_service=ceilometer.alarm.service.SingletonAlarmService
+# Driver to use for alarm evaluation service. DEPRECATED:
+# "singleton" and "partitioned" alarm evaluator services will
+# be removed in Kilo in favour of the default alarm evaluation
+# service using tooz for partitioning. (string value)
+#evaluation_service=default
[api]
@@ -594,121 +625,78 @@
#enable_reverse_dns_lookup=false
-[collector]
-
#
-# Options defined in ceilometer.collector
+# Options defined in ceilometer.api.app
#
-# Address to which the UDP socket is bound. Set to an empty
-# string to disable. (string value)
-#udp_address=0.0.0.0
+# Toggle Pecan Debug Middleware. Defaults to global debug
+# value. (boolean value)
+#pecan_debug=false
-# Port to which the UDP socket is bound. (integer value)
-#udp_port=4952
-
-[database]
+[central]
#
-# Options defined in ceilometer.openstack.common.db.options
+# Options defined in ceilometer.central.manager
#
-# The file name to use with SQLite (string value)
-#sqlite_db=ceilometer.sqlite
-
-# If True, SQLite uses synchronous mode (boolean value)
-#sqlite_synchronous=true
-
-# The backend to use for db (string value)
-# Deprecated group/name - [DEFAULT]/db_backend
-#backend=sqlalchemy
+# Work-load partitioning group prefix. Use only if you want to
+# run multiple central agents with different config files. For
+# each sub-group of the central agent pool with the same
+# partitioning_group_prefix a disjoint subset of pollsters
+# should be loaded. (string value)
+#partitioning_group_prefix=<None>
-# The SQLAlchemy connection string used to connect to the
-# database (string value)
-# Deprecated group/name - [DEFAULT]/sql_connection
-# Deprecated group/name - [DATABASE]/sql_connection
-# Deprecated group/name - [sql]/connection
-#connection=<None>
-# The SQL mode to be used for MySQL sessions. This option,
-# including the default, overrides any server-set SQL mode. To
-# use whatever SQL mode is set by the server configuration,
-# set this to no value. Example: mysql_sql_mode= (string
-# value)
-#mysql_sql_mode=TRADITIONAL
+[collector]
-# Timeout before idle sql connections are reaped (integer
-# value)
-# Deprecated group/name - [DEFAULT]/sql_idle_timeout
-# Deprecated group/name - [DATABASE]/sql_idle_timeout
-# Deprecated group/name - [sql]/idle_timeout
-#idle_timeout=3600
+#
+# Options defined in ceilometer.collector
+#
-# Minimum number of SQL connections to keep open in a pool
-# (integer value)
-# Deprecated group/name - [DEFAULT]/sql_min_pool_size
-# Deprecated group/name - [DATABASE]/sql_min_pool_size
-#min_pool_size=1
+# Address to which the UDP socket is bound. Set to an empty
+# string to disable. (string value)
+#udp_address=0.0.0.0
-# Maximum number of SQL connections to keep open in a pool
-# (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_pool_size
-# Deprecated group/name - [DATABASE]/sql_max_pool_size
-#max_pool_size=<None>
+# Port to which the UDP socket is bound. (integer value)
+#udp_port=4952
-# Maximum db connection retries during startup. (setting -1
-# implies an infinite retry count) (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_retries
-# Deprecated group/name - [DATABASE]/sql_max_retries
-#max_retries=10
+# Requeue the sample on the collector sample queue when the
+# collector fails to dispatch it. This is only valid if the
+# sample come from the notifier publisher (boolean value)
+#requeue_sample_on_dispatcher_error=false
-# Interval between retries of opening a sql connection
-# (integer value)
-# Deprecated group/name - [DEFAULT]/sql_retry_interval
-# Deprecated group/name - [DATABASE]/reconnect_interval
-#retry_interval=10
-# If set, use this value for max_overflow with sqlalchemy
-# (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_overflow
-# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow
-#max_overflow=<None>
+[compute]
-# Verbosity of SQL debugging information. 0=None,
-# 100=Everything (integer value)
-# Deprecated group/name - [DEFAULT]/sql_connection_debug
-#connection_debug=0
+#
+# Options defined in ceilometer.compute.discovery
+#
-# Add python stack traces to SQL as comment strings (boolean
-# value)
-# Deprecated group/name - [DEFAULT]/sql_connection_trace
-#connection_trace=false
+# Enable work-load partitioning, allowing multiple compute
+# agents to be run simultaneously. (boolean value)
+#workload_partitioning=false
-# If set, use this value for pool_timeout with sqlalchemy
-# (integer value)
-# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout
-#pool_timeout=<None>
-# Enable the experimental use of database reconnect on
-# connection lost (boolean value)
-#use_db_reconnect=false
+[coordination]
-# seconds between db connection retries (integer value)
-#db_retry_interval=1
+#
+# Options defined in ceilometer.coordination
+#
-# Whether to increase interval between db connection retries,
-# up to db_max_retry_interval (boolean value)
-#db_inc_retry_interval=true
+# The backend URL to use for distributed coordination. If left
+# empty, per-deployment central agent and per-host compute
+# agent won't do workload partitioning and will only function
+# correctly if a single instance of that service is running.
+# (string value)
+#backend_url=<None>
-# max seconds between db connection retries, if
-# db_inc_retry_interval is enabled (integer value)
-#db_max_retry_interval=10
+# Number of seconds between heartbeats for distributed
+# coordination (float) (floating point value)
+#heartbeat=1.0
-# maximum db connection retries before error is raised.
-# (setting -1 implies an infinite retry count) (integer value)
-#db_max_retries=20
+[database]
#
# Options defined in ceilometer.storage
@@ -759,10 +747,39 @@
#drop_unmatched_notifications=false
+[hardware]
+
+#
+# Options defined in ceilometer.hardware.discovery
+#
+
+# URL scheme to use for hardware nodes (string value)
+#url_scheme=snmp://
+
+# SNMPd user name of all nodes running in the cloud. (string
+# value)
+#readonly_user_name=ro_snmp_user
+
+# SNMPd password of all the nodes running in the cloud (string
+# value)
+#readonly_user_password=password
+
+
+[ipmi]
+
+#
+# Options defined in ceilometer.ipmi.platform.intel_node_manager
+#
+
+# Number of retries upon Intel Node Manager initialization
+# failure (integer value)
+#node_manager_init_retry=3
+
+
[keystone_authtoken]
#
-# Options defined in keystoneclient.middleware.auth_token
+# Options defined in keystonemiddleware.auth_token
#
# Prefix to prepend at the beginning of the path. Deprecated,
@@ -879,6 +896,32 @@
# value)
#memcache_secret_key=<None>
+# (optional) number of seconds memcached server is considered
+# dead before it is tried again. (integer value)
+#memcache_pool_dead_retry=300
+
+# (optional) max total number of open connections to every
+# memcached server. (integer value)
+#memcache_pool_maxsize=10
+
+# (optional) socket timeout in seconds for communicating with
+# a memcache server. (integer value)
+#memcache_pool_socket_timeout=3
+
+# (optional) number of seconds a connection to memcached is
+# held unused in the pool before it is closed. (integer value)
+#memcache_pool_unused_timeout=60
+
+# (optional) number of seconds that an operation will wait to
+# get a memcache client connection from the pool. (integer
+# value)
+#memcache_pool_conn_get_timeout=10
+
+# (optional) use the advanced (eventlet safe) memcache client
+# pool. The advanced pool will only work under python 2.x.
+# (boolean value)
+#memcache_use_advanced_pool=false
+
# (optional) indicate whether to set the X-Service-Catalog
# header. If False, middleware will not ask for service
# catalog on token validation and will not set the X-Service-
@@ -914,6 +957,22 @@
#hash_algorithms=md5
+[matchmaker_redis]
+
+#
+# Options defined in oslo.messaging
+#
+
+# Host to locate redis. (string value)
+#host=127.0.0.1
+
+# Use this port to connect to redis host. (integer value)
+#port=6379
+
+# Password for Redis server (optional). (string value)
+#password=<None>
+
+
[matchmaker_ring]
#
@@ -956,10 +1015,25 @@
#metering_secret=change this or be hacked
+[publisher_notifier]
+
+#
+# Options defined in ceilometer.publisher.messaging
+#
+
+# The topic that ceilometer uses for metering notifications.
+# (string value)
+#metering_topic=metering
+
+# The driver that ceilometer uses for metering notifications.
+# (string value)
+#metering_driver=messagingv2
+
+
[publisher_rpc]
#
-# Options defined in ceilometer.publisher.rpc
+# Options defined in ceilometer.publisher.messaging
#
# The topic that ceilometer uses for metering messages.
@@ -1007,6 +1081,48 @@
#insecure=false
+[service_types]
+
+#
+# Options defined in ceilometer.neutron_client
+#
+
+# Neutron service type. (string value)
+#neutron=network
+
+
+#
+# Options defined in ceilometer.nova_client
+#
+
+# Nova service type. (string value)
+#nova=compute
+
+
+#
+# Options defined in ceilometer.energy.kwapi
+#
+
+# Kwapi service type. (string value)
+#kwapi=energy
+
+
+#
+# Options defined in ceilometer.image.glance
+#
+
+# Glance service type. (string value)
+#glance=image
+
+
+#
+# Options defined in ceilometer.objectstore.swift
+#
+
+# Swift service type. (string value)
+#swift=object-store
+
+
[vmware]
#
@@ -1036,3 +1152,25 @@
#wsdl_location=<None>
+[xenapi]
+
+#
+# Options defined in ceilometer.compute.virt.xenapi.inspector
+#
+
+# URL for connection to XenServer/Xen Cloud Platform (string
+# value)
+#connection_url=<None>
+
+# Username for connection to XenServer/Xen Cloud Platform
+# (string value)
+#connection_username=root
+
+# Password for connection to XenServer/Xen Cloud Platform
+# (string value)
+#connection_password=<None>
+
+# Timeout in seconds for XenAPI login. (integer value)
+#login_timeout=10
+
+
diff --git a/openstack-ceilometer.spec b/openstack-ceilometer.spec
index 89229dd..3cf7a08 100644
--- a/openstack-ceilometer.spec
+++ b/openstack-ceilometer.spec
@@ -4,16 +4,16 @@
Name: openstack-ceilometer
Version: 2014.2
-Release: 0.6.b3%{?dist}
+Release: 0.8.rc2%{?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}.rc2.tar.gz
Source1: %{pypi_name}-dist.conf
Source2: %{pypi_name}.logrotate
-Source3: %{pypi_name}.conf.sample
+Source3: %{pypi_name}.conf.sample
%if 0%{?rhel} && 0%{?rhel} <= 6
Source10: %{name}-api.init
@@ -41,7 +41,7 @@ Source16: %{name}-notification.service
%endif
#
-# patches_base=2014.2.b3
+# patches_base=2014.2.rc2
#
BuildArch: noarch
@@ -72,7 +72,7 @@ Requires: python-iso8601
Requires: python-lxml
Requires: python-anyjson
Requires: python-jsonpath-rw
-Requires: python-stevedore >= 0.14
+Requires: python-stevedore >= 1.0.0
Requires: python-msgpack
Requires: python-six >= 1.6
@@ -81,8 +81,13 @@ Requires: python-alembic
Requires: python-migrate
Requires: python-webob
-Requires: python-oslo-config >= 1:1.2.0
+Requires: python-oslo-config >= 2:1.4.0
Requires: PyYAML
+Requires: python-netaddr
+Requires: python-oslo-config >= 2:1.4.0
+Requires: python-oslo-rootwrap
+Requires: python-oslo-vmware >= 0.6.0
+Requires: python-requests >= 1.2.1
Requires: pysnmp
Requires: pytz
@@ -257,7 +262,7 @@ This package contains documentation files for ceilometer.
%endif
%prep
-%setup -q -n ceilometer-%{version}.b3
+%setup -q -n ceilometer-%{version}.rc2
find . \( -name .gitignore -o -name .placeholder \) -delete
@@ -591,6 +596,9 @@ fi
%{_bindir}/ceilometer-dbsync
%{_bindir}/ceilometer-expirer
%{_bindir}/ceilometer-send-sample
+%{_bindir}/ceilometer-rootwrap
+# ipmi subpackage?
+%{_bindir}/ceilometer-agent-ipmi
%defattr(-, ceilometer, ceilometer, -)
@@ -674,6 +682,9 @@ fi
%changelog
+* Sat Oct 11 2014 Alan Pevec <alan.pevec at redhat.com> 2014.2-0.8.rc2
+- Update to upstream 2014.2.rc2
+
* Fri Oct 10 2014 Pádraig Brady <pbrady at redhat.com> - 2014.2-0.6.b3
- Ensure service files are registered with systemd at install time
@@ -745,7 +756,7 @@ fi
* Fri Sep 13 2013 Pádraig Brady <pbrady at redhat.com> - 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 <pbrady at redhat.com> - 2013.2-0.8.b3
+* Mon Sep 9 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.8.b3
- Depend on python-pymongo rather than pymongo to avoid a puppet bug
* Mon Sep 9 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.7.b3
diff --git a/sources b/sources
index a2733e1..0f543eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-52ff01dc5fd562e10b2b485b7545be5a ceilometer-2014.2.b3.tar.gz
+f77461702d294e7efc2a4796a97bcb62 ceilometer-2014.2.rc2.tar.gz
More information about the scm-commits
mailing list