From 2ecca9020bea3d1117b35a696e1c612266c58981 Mon Sep 17 00:00:00 2001 From: iberezovskiy Date: Tue, 13 Jan 2015 13:37:53 +0300 Subject: [PATCH] Update ceilometer deb package to 2015.1 version Change-Id: Ia6c494b9903335c8e6896ffa8fe7b82a5a6f3410 --- debian/ceilometer-agent-central.init.in | 19 + debian/ceilometer-agent-central.upstart | 17 - debian/ceilometer-agent-compute.init.in | 19 + debian/ceilometer-agent-compute.upstart | 17 - debian/ceilometer-agent-ipmi.init.in | 19 + debian/ceilometer-agent-ipmi.install | 2 + debian/ceilometer-agent-ipmi.postrm | 7 + debian/ceilometer-agent-notification.init.in | 19 + debian/ceilometer-agent-notification.postrm | 7 + debian/ceilometer-agent-notification.upstart | 17 - debian/ceilometer-alarm-evaluator.init.in | 19 + debian/ceilometer-alarm-evaluator.postrm | 10 - debian/ceilometer-alarm-evaluator.upstart | 17 - debian/ceilometer-alarm-notifier.init.in | 19 + debian/ceilometer-alarm-notifier.postrm | 10 - debian/ceilometer-alarm-notifier.upstart | 17 - debian/ceilometer-api.init.in | 19 + debian/ceilometer-api.upstart | 17 - debian/ceilometer-collector.init.in | 20 + debian/ceilometer-collector.upstart | 17 - debian/ceilometer-common.install | 6 +- debian/ceilometer-common.logrotate | 8 + debian/ceilometer-polling.init.in | 19 + debian/ceilometer-polling.install | 1 + debian/ceilometer-polling.postrm | 7 + debian/ceilometer.conf.sample | 1003 ----------------- debian/changelog | 186 ++- debian/compat | 2 +- debian/control | 160 ++- debian/patches/default-config.patch | 20 + debian/patches/series | 1 + debian/patches/skip-db-tests.patch | 39 + debian/pydist-overrides | 1 + debian/rules | 22 +- debian/tests/control | 4 +- debian/tests/{test_daemons => test-daemons} | 2 +- ...thon_ceilometer => test-python-ceilometer} | 0 debian/watch | 4 +- 38 files changed, 561 insertions(+), 1232 deletions(-) create mode 100644 debian/ceilometer-agent-central.init.in delete mode 100644 debian/ceilometer-agent-central.upstart create mode 100644 debian/ceilometer-agent-compute.init.in delete mode 100644 debian/ceilometer-agent-compute.upstart create mode 100644 debian/ceilometer-agent-ipmi.init.in create mode 100644 debian/ceilometer-agent-ipmi.install create mode 100644 debian/ceilometer-agent-ipmi.postrm create mode 100644 debian/ceilometer-agent-notification.init.in create mode 100644 debian/ceilometer-agent-notification.postrm delete mode 100644 debian/ceilometer-agent-notification.upstart create mode 100644 debian/ceilometer-alarm-evaluator.init.in delete mode 100644 debian/ceilometer-alarm-evaluator.postrm delete mode 100644 debian/ceilometer-alarm-evaluator.upstart create mode 100644 debian/ceilometer-alarm-notifier.init.in delete mode 100644 debian/ceilometer-alarm-notifier.postrm delete mode 100644 debian/ceilometer-alarm-notifier.upstart create mode 100644 debian/ceilometer-api.init.in delete mode 100644 debian/ceilometer-api.upstart create mode 100644 debian/ceilometer-collector.init.in delete mode 100644 debian/ceilometer-collector.upstart create mode 100644 debian/ceilometer-common.logrotate create mode 100644 debian/ceilometer-polling.init.in create mode 100644 debian/ceilometer-polling.install create mode 100644 debian/ceilometer-polling.postrm delete mode 100644 debian/ceilometer.conf.sample create mode 100644 debian/patches/default-config.patch create mode 100644 debian/patches/series create mode 100644 debian/patches/skip-db-tests.patch rename debian/tests/{test_daemons => test-daemons} (78%) rename debian/tests/{test_python_ceilometer => test-python-ceilometer} (100%) diff --git a/debian/ceilometer-agent-central.init.in b/debian/ceilometer-agent-central.init.in new file mode 100644 index 0000000..3c1bd16 --- /dev/null +++ b/debian/ceilometer-agent-central.init.in @@ -0,0 +1,19 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-agent-central +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mongodb rabbitmq-server +# Should-Stop: mongodb rabbitmq-server +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ceilometer central agent +# Description: ceilometer central agent +### END INIT INFO + +# Author: Thomas Goirand + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer Agent Central" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-agent-central diff --git a/debian/ceilometer-agent-central.upstart b/debian/ceilometer-agent-central.upstart deleted file mode 100644 index 82b966e..0000000 --- a/debian/ceilometer-agent-central.upstart +++ /dev/null @@ -1,17 +0,0 @@ -description "ceilometer-agent-compute" -author "Chuck Short " - -start on runlevel [2345] -stop on runlevel [!2345] - -chdir /var/run - -pre-start script - mkdir -p /var/run/ceilometer - chown ceilometer:ceilometer /var/run/ceilometer - - mkdir -p /var/lock/ceilometer - chown ceilometer:ceilometer /var/lock/ceilometer -end script - -exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-agent-central diff --git a/debian/ceilometer-agent-compute.init.in b/debian/ceilometer-agent-compute.init.in new file mode 100644 index 0000000..95f619d --- /dev/null +++ b/debian/ceilometer-agent-compute.init.in @@ -0,0 +1,19 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-agent-compute +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mongodb rabbitmq-server +# Should-Stop: mongodb rabbitmq-server +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ceilometer central compute +# Description: ceilometer central compute +### END INIT INFO + +# Author: Thomas Goirand + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer Agent Compute" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-agent-compute diff --git a/debian/ceilometer-agent-compute.upstart b/debian/ceilometer-agent-compute.upstart deleted file mode 100644 index 6824e2b..0000000 --- a/debian/ceilometer-agent-compute.upstart +++ /dev/null @@ -1,17 +0,0 @@ -description "ceilometer-agent-compute" -author "Chuck Short " - -start on runlevel [2345] -stop on runlevel [!2345] - -chdir /var/run - -pre-start script - mkdir -p /var/run/ceilometer - chown ceilometer:ceilometer /var/run/ceilometer - - mkdir -p /var/lock/ceilometer - chown ceilometer:ceilometer /var/lock/ceilometer -end script - -exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-agent-compute diff --git a/debian/ceilometer-agent-ipmi.init.in b/debian/ceilometer-agent-ipmi.init.in new file mode 100644 index 0000000..e9cce3e --- /dev/null +++ b/debian/ceilometer-agent-ipmi.init.in @@ -0,0 +1,19 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-agent-ipmi +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mongodb rabbitmq-server +# Should-Stop: mongodb rabbitmq-server +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ceilometer ipmi agent +# Description: ceilometer ipmi agent +### END INIT INFO + +# Author: Corey Bryant + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer IPMI Agent" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-agent-ipmi diff --git a/debian/ceilometer-agent-ipmi.install b/debian/ceilometer-agent-ipmi.install new file mode 100644 index 0000000..5e68748 --- /dev/null +++ b/debian/ceilometer-agent-ipmi.install @@ -0,0 +1,2 @@ +etc/ceilometer/rootwrap.d/ipmi.filters +usr/bin/ceilometer-agent-ipmi diff --git a/debian/ceilometer-agent-ipmi.postrm b/debian/ceilometer-agent-ipmi.postrm new file mode 100644 index 0000000..90ee627 --- /dev/null +++ b/debian/ceilometer-agent-ipmi.postrm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +if [ "$1" = purge ]; then + update-rc.d ceilometer-agent-ipmi remove +fi + +#DEBHELPER# diff --git a/debian/ceilometer-agent-notification.init.in b/debian/ceilometer-agent-notification.init.in new file mode 100644 index 0000000..57eec2f --- /dev/null +++ b/debian/ceilometer-agent-notification.init.in @@ -0,0 +1,19 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-agent-notification +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mongodb rabbitmq-server +# Should-Stop: mongodb rabbitmq-server +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ceilometer agent notification +# Description: ceilometer agent notification +### END INIT INFO + +# Author: Thomas Goirand + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer Notification Agent" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-agent-notification diff --git a/debian/ceilometer-agent-notification.postrm b/debian/ceilometer-agent-notification.postrm new file mode 100644 index 0000000..ff2550a --- /dev/null +++ b/debian/ceilometer-agent-notification.postrm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +if [ "$1" = purge ]; then + update-rc.d ceilometer-agent-notification remove +fi + +#DEBHELPER# diff --git a/debian/ceilometer-agent-notification.upstart b/debian/ceilometer-agent-notification.upstart deleted file mode 100644 index 4f5a4c9..0000000 --- a/debian/ceilometer-agent-notification.upstart +++ /dev/null @@ -1,17 +0,0 @@ -description "ceilometer-agent-notification" -author "Yolanda Robla " - -start on runlevel [2345] -stop on runlevel [!2345] - -chdir /var/run - -pre-start script - mkdir -p /var/run/ceilometer - chown ceilometer:ceilometer /var/run/ceilometer - - mkdir -p /var/lock/ceilometer - chown ceilometer:ceilometer /var/lock/ceilometer -end script - -exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-agent-notification diff --git a/debian/ceilometer-alarm-evaluator.init.in b/debian/ceilometer-alarm-evaluator.init.in new file mode 100644 index 0000000..051bae7 --- /dev/null +++ b/debian/ceilometer-alarm-evaluator.init.in @@ -0,0 +1,19 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-alarm-evaluator +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mongodb rabbitmq-server +# Should-Stop: mongodb rabbitmq-server +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ceilometer alarm evaluator +# Description: ceilometer alarm evaluator +### END INIT INFO + +# Author: Thomas Goirand + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer Alarm Evaluator" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-alarm-evaluator diff --git a/debian/ceilometer-alarm-evaluator.postrm b/debian/ceilometer-alarm-evaluator.postrm deleted file mode 100644 index 99105ef..0000000 --- a/debian/ceilometer-alarm-evaluator.postrm +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -if [ "${1}" = purge ] ; then - rm -f /var/log/ceilometer/ceilometer-alarm-evaluator.log* - [ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer -fi - -#DEBHELPER# diff --git a/debian/ceilometer-alarm-evaluator.upstart b/debian/ceilometer-alarm-evaluator.upstart deleted file mode 100644 index a01fe41..0000000 --- a/debian/ceilometer-alarm-evaluator.upstart +++ /dev/null @@ -1,17 +0,0 @@ -description "ceilometer-alarm-evaluator" -author "Chuck Short " - -start on runlevel [2345] -stop on runlevel [016] - -chdir /var/run - -pre-start script - mkdir -p /var/run/ceilometer - chown ceilometer:ceilometer /var/run/ceilometer - - mkdir -p /var/lock/ceilometer - chown ceilometer:ceilometer /var/lock/ceilometer -end script - -exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-alarm-evaluator -- --log-dir=/var/log/ceilometer diff --git a/debian/ceilometer-alarm-notifier.init.in b/debian/ceilometer-alarm-notifier.init.in new file mode 100644 index 0000000..d9304c1 --- /dev/null +++ b/debian/ceilometer-alarm-notifier.init.in @@ -0,0 +1,19 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-alarm-notifier +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mongodb rabbitmq-server +# Should-Stop: mongodb rabbitmq-server +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ceilometer alarm notifier +# Description: ceilometer alarm notifier +### END INIT INFO + +# Author: Thomas Goirand + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer Alarm Notifier" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-alarm-notifier diff --git a/debian/ceilometer-alarm-notifier.postrm b/debian/ceilometer-alarm-notifier.postrm deleted file mode 100644 index e13d5c4..0000000 --- a/debian/ceilometer-alarm-notifier.postrm +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -if [ "${1}" = purge ] ; then - rm -f /var/log/ceilometer/ceilometer-alarm-notifier.log* - [ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer -fi - -#DEBHELPER# diff --git a/debian/ceilometer-alarm-notifier.upstart b/debian/ceilometer-alarm-notifier.upstart deleted file mode 100644 index b2a2848..0000000 --- a/debian/ceilometer-alarm-notifier.upstart +++ /dev/null @@ -1,17 +0,0 @@ -description "ceilometer-alarm-notifier" -author "Chuck Short " - -start on runlevel [2345] -stop on runlevel [016] - -chdir /var/run - -pre-start script - mkdir -p /var/run/ceilometer - chown ceilometer:ceilometer /var/run/ceilometer - - mkdir -p /var/lock/ceilometer - chown ceilometer:ceilometer /var/lock/ceilometer -end script - -exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-alarm-notifier -- --log-dir=/var/log/ceilometer diff --git a/debian/ceilometer-api.init.in b/debian/ceilometer-api.init.in new file mode 100644 index 0000000..74b0797 --- /dev/null +++ b/debian/ceilometer-api.init.in @@ -0,0 +1,19 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-api +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mongodb rabbitmq-server +# Should-Stop: mongodb rabbitmq-server +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ceilometer api +# Description: ceilometer api +### END INIT INFO + +# Author: Thomas Goirand + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer API" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-api diff --git a/debian/ceilometer-api.upstart b/debian/ceilometer-api.upstart deleted file mode 100644 index 827d77f..0000000 --- a/debian/ceilometer-api.upstart +++ /dev/null @@ -1,17 +0,0 @@ -description "ceilometer-agent-compute" -author "Chuck Short " - -start on runlevel [2345] -stop on runlevel [016] - -chdir /var/run - -pre-start script - mkdir -p /var/run/ceilometer - chown ceilometer:ceilometer /var/run/ceilometer - - mkdir -p /var/lock/ceilometer - chown ceilometer:ceilometer /var/lock/ceilometer -end script - -exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-api -- --log-dir=/var/log/ceilometer diff --git a/debian/ceilometer-collector.init.in b/debian/ceilometer-collector.init.in new file mode 100644 index 0000000..b7b0d6b --- /dev/null +++ b/debian/ceilometer-collector.init.in @@ -0,0 +1,20 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-collector +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mongodb rabbitmq-server +# Should-Stop: mongodb rabbitmq-server +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ceilometer collector +# Description: ceilometer collector +### END INIT INFO + +# Author: Thomas Goirand +# License: Apache-2 + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer Collector" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-collector diff --git a/debian/ceilometer-collector.upstart b/debian/ceilometer-collector.upstart deleted file mode 100644 index 23b996f..0000000 --- a/debian/ceilometer-collector.upstart +++ /dev/null @@ -1,17 +0,0 @@ -description "ceilometer-agent-compute" -author "Chuck Short " - -start on runlevel [2345] -stop on runlevel [!2345] - -chdir /var/run - -pre-start script - mkdir -p /var/run/ceilometer - chown ceilometer:ceilometer /var/run/ceilometer - - mkdir -p /var/lock/ceilometer - chown ceilometer:ceilometer /var/lock/ceilometer -end script - -exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-collector diff --git a/debian/ceilometer-common.install b/debian/ceilometer-common.install index 9f58d52..7482746 100644 --- a/debian/ceilometer-common.install +++ b/debian/ceilometer-common.install @@ -1,10 +1,10 @@ +etc/ceilometer/api_paste.ini etc/ceilometer etc/ceilometer/ceilometer.conf etc/ceilometer +etc/ceilometer/event_definitions.yaml etc/ceilometer etc/ceilometer/pipeline.yaml etc/ceilometer etc/ceilometer/policy.json etc/ceilometer -etc/ceilometer/api_paste.ini etc/ceilometer -etc/ceilometer/event_definitions.yaml etc/ceilometer +etc/ceilometer/rootwrap.conf etc/ceilometer tools/show_data.py usr/share/doc/ceilometer -usr/bin/ceilometer-agent-ipmi usr/bin/ceilometer-dbsync usr/bin/ceilometer-expirer usr/bin/ceilometer-rootwrap diff --git a/debian/ceilometer-common.logrotate b/debian/ceilometer-common.logrotate new file mode 100644 index 0000000..e7185b7 --- /dev/null +++ b/debian/ceilometer-common.logrotate @@ -0,0 +1,8 @@ +/var/log/ceilometer/*.log { + daily + missingok + compress + delaycompress + notifempty + copytruncate +} diff --git a/debian/ceilometer-polling.init.in b/debian/ceilometer-polling.init.in new file mode 100644 index 0000000..86daac5 --- /dev/null +++ b/debian/ceilometer-polling.init.in @@ -0,0 +1,19 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-polling +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mongodb rabbitmq-server +# Should-Stop: mongodb rabbitmq-server +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ceilometer polling +# Description: ceilometer polling +### END INIT INFO + +# Author: Corey Bryant + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer Polling" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-polling diff --git a/debian/ceilometer-polling.install b/debian/ceilometer-polling.install new file mode 100644 index 0000000..01b9d03 --- /dev/null +++ b/debian/ceilometer-polling.install @@ -0,0 +1 @@ +usr/bin/ceilometer-polling diff --git a/debian/ceilometer-polling.postrm b/debian/ceilometer-polling.postrm new file mode 100644 index 0000000..36455ce --- /dev/null +++ b/debian/ceilometer-polling.postrm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +if [ "$1" = purge ]; then + update-rc.d ceilometer-polling remove +fi + +#DEBHELPER# diff --git a/debian/ceilometer.conf.sample b/debian/ceilometer.conf.sample deleted file mode 100644 index fe23825..0000000 --- a/debian/ceilometer.conf.sample +++ /dev/null @@ -1,1003 +0,0 @@ -[DEFAULT] - -# -# Options defined in oslo.messaging -# - -# Use durable queues in amqp. (boolean value) -# Deprecated group/name - [DEFAULT]/rabbit_durable_queues -#amqp_durable_queues=false - -# Auto-delete queues in amqp. (boolean value) -#amqp_auto_delete=false - -# 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 - -# Qpid broker port. (integer value) -#qpid_port=5672 - -# Qpid HA cluster host:port pairs. (list value) -#qpid_hosts=$qpid_hostname:$qpid_port - -# Username for Qpid connection. (string value) -#qpid_username= - -# Password for Qpid connection. (string value) -#qpid_password= - -# Space separated list of SASL mechanisms to use for auth. -# (string value) -#qpid_sasl_mechanisms= - -# Seconds between connection keepalive heartbeats. (integer -# value) -#qpid_heartbeat=60 - -# Transport to use, either 'tcp' or 'ssl'. (string value) -#qpid_protocol=tcp - -# Whether to disable the Nagle algorithm. (boolean value) -#qpid_tcp_nodelay=true - -# 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 -# to work. Users should update to version 2 when they are -# able to take everything down, as it requires a clean break. -# (integer value) -#qpid_topology_version=1 - -# SSL version to use (valid only if SSL enabled). valid values -# are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some -# distributions. (string value) -#kombu_ssl_version= - -# SSL key file (valid only if SSL enabled). (string value) -#kombu_ssl_keyfile= - -# SSL cert file (valid only if SSL enabled). (string value) -#kombu_ssl_certfile= - -# SSL certification authority file (valid only if SSL -# enabled). (string value) -#kombu_ssl_ca_certs= - -# How long to wait before reconnecting in response to an AMQP -# consumer cancel notification. (floating point value) -#kombu_reconnect_delay=1.0 - -# The RabbitMQ broker address where a single node is used. -# (string value) -#rabbit_host=localhost - -# The RabbitMQ broker port where a single node is used. -# (integer value) -#rabbit_port=5672 - -# RabbitMQ HA cluster host:port pairs. (list value) -#rabbit_hosts=$rabbit_host:$rabbit_port - -# Connect over SSL for RabbitMQ. (boolean value) -#rabbit_use_ssl=false - -# The RabbitMQ userid. (string value) -#rabbit_userid=guest - -# The RabbitMQ password. (string value) -#rabbit_password=guest - -# the RabbitMQ login method (string value) -#rabbit_login_method=AMQPLAIN - -# The RabbitMQ virtual host. (string value) -#rabbit_virtual_host=/ - -# How frequently to retry connecting with RabbitMQ. (integer -# value) -#rabbit_retry_interval=1 - -# How long to backoff for between retries when connecting to -# RabbitMQ. (integer value) -#rabbit_retry_backoff=2 - -# Maximum number of RabbitMQ connection retries. Default is 0 -# (infinite retry count). (integer value) -#rabbit_max_retries=0 - -# Use HA queues in RabbitMQ (x-ha-policy: all). If you change -# this option, you must wipe the RabbitMQ database. (boolean -# value) -#rabbit_ha_queues=false - -# If passed, use a fake RabbitMQ provider. (boolean value) -#fake_rabbit=false - -# ZeroMQ bind address. Should be a wildcard (*), an ethernet -# interface, or IP. The "host" option should point or resolve -# to this address. (string value) -#rpc_zmq_bind_address=* - -# MatchMaker driver. (string value) -#rpc_zmq_matchmaker=oslo.messaging._drivers.matchmaker.MatchMakerLocalhost - -# ZeroMQ receiver listening port. (integer value) -#rpc_zmq_port=9501 - -# Number of ZeroMQ contexts, defaults to 1. (integer value) -#rpc_zmq_contexts=1 - -# Maximum number of ingress messages to locally buffer per -# topic. Default is unlimited. (integer value) -#rpc_zmq_topic_backlog= - -# Directory for holding IPC sockets. (string value) -#rpc_zmq_ipc_dir=/var/run/openstack - -# Name of this node. Must be a valid hostname, FQDN, or IP -# address. Must match "host" option, if running Nova. (string -# value) -#rpc_zmq_host=ceilometer - -# Seconds to wait before a cast expires (TTL). Only supported -# by impl_zmq. (integer value) -#rpc_cast_timeout=30 - -# Heartbeat frequency. (integer value) -#matchmaker_heartbeat_freq=300 - -# 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= - -# Size of RPC greenthread pool. (integer value) -#rpc_thread_pool_size=64 - -# Driver or drivers to handle sending notifications. (multi -# valued) -#notification_driver= - -# AMQP topic used for OpenStack notifications. (list value) -# Deprecated group/name - [rpc_notifier2]/topics -#notification_topics=notifications - -# Seconds to wait for a response from a call. (integer value) -#rpc_response_timeout=60 - -# A URL representing the messaging driver to use and its full -# configuration. If not set, we fall back to the rpc_backend -# option and driver specific configuration. (string value) -#transport_url= - -# The messaging driver to use, defaults to rabbit. Other -# drivers include qpid and zmq. (string value) -#rpc_backend=rabbit - -# The default exchange under which topics are scoped. May be -# overridden by an exchange name specified in the -# transport_url option. (string value) -#control_exchange=openstack - - -# -# Options defined in ceilometer.middleware -# - -# Exchanges name to listen for notifications. (multi valued) -#http_control_exchanges=nova -#http_control_exchanges=glance -#http_control_exchanges=neutron -#http_control_exchanges=cinder - - -# -# Options defined in ceilometer.pipeline -# - -# Configuration file for pipeline definition. (string value) -#pipeline_cfg_file=pipeline.yaml - - -# -# Options defined in ceilometer.sample -# - -# Source for samples emitted on this instance. (string value) -# Deprecated group/name - [DEFAULT]/counter_source -#sample_source=openstack - - -# -# Options defined in ceilometer.service -# - -# Name of this node, which must be valid in an AMQP key. Can -# be an opaque identifier. For ZeroMQ only, must be a valid -# host name, FQDN, or IP address. (string value) -#host=ceilometer - -# Number of workers for collector service. A single collector -# is enabled by default. (integer value) -#collector_workers=1 - -# Number of workers for notification service. A single -# notification agent is enabled by default. (integer value) -#notification_workers=1 - - -# -# Options defined in ceilometer.api.app -# - -# Configuration file for WSGI definition of API. (string -# value) -#api_paste_config=api_paste.ini - - -# -# Options defined in ceilometer.compute.notifications -# - -# Exchange name for Nova notifications. (string value) -#nova_control_exchange=nova - - -# -# Options defined in ceilometer.compute.util -# - -# List of metadata prefixes reserved for metering use. (list -# value) -#reserved_metadata_namespace=metering. - -# Limit on length of reserved metadata values. (integer value) -#reserved_metadata_length=256 - - -# -# Options defined in ceilometer.compute.virt.inspector -# - -# Inspector to use for inspecting the hypervisor layer. -# (string value) -#hypervisor_inspector=libvirt - - -# -# Options defined in ceilometer.compute.virt.libvirt.inspector -# - -# Libvirt domain type (valid options are: kvm, lxc, qemu, uml, -# xen). (string value) -#libvirt_type=kvm - -# Override the default libvirt URI (which is dependent on -# libvirt_type). (string value) -#libvirt_uri= - - -# -# Options defined in ceilometer.dispatcher -# - -# Dispatcher to process data. (multi valued) -#dispatcher=database - - -# -# Options defined in ceilometer.image.notifications -# - -# Exchange name for Glance notifications. (string value) -#glance_control_exchange=glance - - -# -# Options defined in ceilometer.network.notifications -# - -# Exchange name for Neutron notifications. (string value) -# Deprecated group/name - [DEFAULT]/quantum_control_exchange -#neutron_control_exchange=neutron - - -# -# Options defined in ceilometer.objectstore.swift -# - -# Swift reseller prefix. Must be on par with reseller_prefix -# in proxy-server.conf. (string value) -#reseller_prefix=AUTH_ - - -# -# Options defined in ceilometer.openstack.common.eventlet_backdoor -# - -# Enable eventlet backdoor. Acceptable values are 0, , -# and :, where 0 results in listening on a random -# tcp port number; results in listening on the -# specified port number (and not enabling backdoor if that -# port is in use); and : results in listening on -# the smallest unused port number within the specified range -# of port numbers. The chosen port is displayed in the -# service's log file. (string value) -#backdoor_port= - - -# -# Options defined in ceilometer.openstack.common.lockutils -# - -# Enables or disables inter-process locks. (boolean value) -#disable_process_locking=false - -# Directory to use for lock files. (string value) -#lock_path= - - -# -# Options defined in ceilometer.openstack.common.log -# - -# Print debugging output (set logging level to DEBUG instead -# of default WARNING level). (boolean value) -#debug=false - -# Print more verbose output (set logging level to INFO instead -# of default WARNING level). (boolean value) -#verbose=false - -# Log output to standard error. (boolean value) -#use_stderr=true - -# Format string to use for log messages with context. (string -# value) -#logging_context_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s - -# Format string to use for log messages without context. -# (string value) -#logging_default_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s - -# Data to append to log format when level is DEBUG. (string -# value) -#logging_debug_format_suffix=%(funcName)s %(pathname)s:%(lineno)d - -# Prefix each line of exception output with this format. -# (string value) -#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 - -# Enables or disables publication of error events. (boolean -# value) -#publish_errors=false - -# Enables or disables fatal status of deprecations. (boolean -# value) -#fatal_deprecations=false - -# The format for an instance that is passed with the log -# message. (string value) -#instance_format="[instance: %(uuid)s] " - -# The format for an instance UUID that is passed with the log -# message. (string value) -#instance_uuid_format="[instance: %(uuid)s] " - -# The name of a logging configuration file. This file is -# appended to any existing logging configuration files. For -# details about logging configuration files, see the Python -# logging module documentation. (string value) -# Deprecated group/name - [DEFAULT]/log_config -#log_config_append= - -# DEPRECATED. A logging.Formatter log message format string -# which may use any of the available logging.LogRecord -# attributes. This option is deprecated. Please use -# logging_context_format_string and -# logging_default_format_string instead. (string value) -#log_format= - -# Format string for %%(asctime)s in log records. Default: -# %(default)s . (string value) -#log_date_format=%Y-%m-%d %H:%M:%S - -# (Optional) Name of log file to output to. If no default is -# set, logging will go to stdout. (string value) -# Deprecated group/name - [DEFAULT]/logfile -#log_file= - -# (Optional) The base directory used for relative --log-file -# paths. (string value) -# Deprecated group/name - [DEFAULT]/logdir -#log_dir= - -# Use syslog for logging. Existing syslog format is DEPRECATED -# during I, and will change in J to honor RFC5424. (boolean -# value) -#use_syslog=false - -# (Optional) Enables or disables syslog rfc5424 format for -# logging. If enabled, prefixes the MSG part of the syslog -# message with APP-NAME (RFC5424). The format without the APP- -# NAME is deprecated in I, and will be removed in J. (boolean -# value) -#use_syslog_rfc_format=false - -# Syslog facility to receive log lines. (string value) -#syslog_log_facility=LOG_USER - - -# -# 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 -# - -# The JSON file that defines policies. (string value) -#policy_file=policy.json - -# Default rule. Enforced when a requested rule is not found. -# (string value) -#policy_default_rule=default - - -# -# Options defined in ceilometer.orchestration.notifications -# - -# Exchange name for Heat notifications (string value) -#heat_control_exchange=heat - - -# -# Options defined in ceilometer.storage -# - -# DEPRECATED - Database connection string. (string value) -#database_connection= - - -# -# Options defined in ceilometer.volume.notifications -# - -# Exchange name for Cinder notifications. (string value) -#cinder_control_exchange=cinder - - -[alarm] - -# -# Options defined in ceilometer.cli -# - -# Class to launch as alarm evaluation service. (string value) -#evaluation_service=ceilometer.alarm.service.SingletonAlarmService - - -# -# Options defined in ceilometer.alarm.notifier.rest -# - -# SSL Client certificate for REST notifier. (string value) -#rest_notifier_certificate_file= - -# SSL Client private key for REST notifier. (string value) -#rest_notifier_certificate_key= - -# Whether to verify the SSL Server certificate when calling -# alarm action. (boolean value) -#rest_notifier_ssl_verify=true - - -# -# Options defined in ceilometer.alarm.rpc -# - -# The topic that ceilometer uses for alarm notifier messages. -# (string value) -#notifier_rpc_topic=alarm_notifier - -# The topic that ceilometer uses for alarm partition -# coordination messages. (string value) -#partition_rpc_topic=alarm_partition_coordination - - -# -# Options defined in ceilometer.alarm.service -# - -# Period of evaluation cycle, should be >= than configured -# pipeline interval for collection of underlying metrics. -# (integer value) -# Deprecated group/name - [alarm]/threshold_evaluation_interval -#evaluation_interval=60 - - -# -# Options defined in ceilometer.api.controllers.v2 -# - -# Record alarm change events. (boolean value) -#record_history=true - - -[api] - -# -# Options defined in ceilometer.api -# - -# The port for the ceilometer API server. (integer value) -# Deprecated group/name - [DEFAULT]/metering_api_port -#port=8777 - -# The listen IP for the ceilometer API server. (string value) -#host=0.0.0.0 - -# Set it to False if your environment does not need or have -# dns server, otherwise it will delay the response from api. -# (boolean value) -#enable_reverse_dns_lookup=false - - -[collector] - -# -# Options defined in ceilometer.collector -# - -# Address to which the UDP socket is bound. Set to an empty -# string to disable. (string value) -#udp_address=0.0.0.0 - -# Port to which the UDP socket is bound. (integer value) -#udp_port=4952 - - -[database] - -# -# Options defined in ceilometer.openstack.common.db.options -# - -# 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 - -# 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= - -# 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 - -# 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 - -# 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 - -# 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= - -# 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 - -# 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= - -# Verbosity of SQL debugging information. 0=None, -# 100=Everything (integer value) -# Deprecated group/name - [DEFAULT]/sql_connection_debug -#connection_debug=0 - -# Add python stack traces to SQL as comment strings (boolean -# value) -# Deprecated group/name - [DEFAULT]/sql_connection_trace -#connection_trace=false - -# If set, use this value for pool_timeout with sqlalchemy -# (integer value) -# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout -#pool_timeout= - -# Enable the experimental use of database reconnect on -# connection lost (boolean value) -#use_db_reconnect=false - -# seconds between db connection retries (integer value) -#db_retry_interval=1 - -# Whether to increase interval between db connection retries, -# up to db_max_retry_interval (boolean value) -#db_inc_retry_interval=true - -# max seconds between db connection retries, if -# db_inc_retry_interval is enabled (integer value) -#db_max_retry_interval=10 - -# maximum db connection retries before error is raised. -# (setting -1 implies an infinite retry count) (integer value) -#db_max_retries=20 - - -# -# Options defined in ceilometer.storage -# - -# Number of seconds that samples are kept in the database for -# (<= 0 means forever). (integer value) -#time_to_live=-1 - - -[dispatcher_file] - -# -# Options defined in ceilometer.dispatcher.file -# - -# Name and the location of the file to record meters. (string -# value) -#file_path= - -# The max size of the file. (integer value) -#max_bytes=0 - -# The max number of the files to keep. (integer value) -#backup_count=0 - - -[event] - -# -# Options defined in ceilometer.event.converter -# - -# Configuration file for event definitions. (string value) -#definitions_cfg_file=event_definitions.yaml - -# Drop notifications if no event definition matches. -# (Otherwise, we convert them with just the default traits) -# (boolean value) -#drop_unmatched_notifications=false - - -[keystone_authtoken] - -# -# Options defined in keystoneclient.middleware.auth_token -# - -# Prefix to prepend at the beginning of the path. Deprecated, -# use identity_uri. (string value) -#auth_admin_prefix= - -# Host providing the admin Identity API endpoint. Deprecated, -# use identity_uri. (string value) -#auth_host=127.0.0.1 - -# Port of the admin Identity API endpoint. Deprecated, use -# identity_uri. (integer value) -#auth_port=35357 - -# Protocol of the admin Identity API endpoint (http or https). -# Deprecated, use identity_uri. (string value) -#auth_protocol=https - -# Complete public Identity API endpoint (string value) -#auth_uri= - -# Complete admin Identity API endpoint. This should specify -# the unversioned root endpoint e.g. https://localhost:35357/ -# (string value) -#identity_uri= - -# API version of the admin Identity API endpoint (string -# value) -#auth_version= - -# Do not handle authorization requests within the middleware, -# but delegate the authorization decision to downstream WSGI -# components (boolean value) -#delay_auth_decision=false - -# Request timeout value for communicating with Identity API -# server. (boolean value) -#http_connect_timeout= - -# How many times are we trying to reconnect when communicating -# with Identity API Server. (integer value) -#http_request_max_retries=3 - -# This option is deprecated and may be removed in a future -# release. Single shared secret with the Keystone -# configuration used for bootstrapping a Keystone -# installation, or otherwise bypassing the normal -# authentication process. This option should not be used, use -# `admin_user` and `admin_password` instead. (string value) -#admin_token= - -# Keystone account username (string value) -#admin_user= - -# Keystone account password (string value) -#admin_password= - -# Keystone service account tenant name to validate user tokens -# (string value) -#admin_tenant_name=admin - -# Env key for the swift cache (string value) -#cache= - -# Required if Keystone server requires client certificate -# (string value) -#certfile= - -# Required if Keystone server requires client certificate -# (string value) -#keyfile= - -# A PEM encoded Certificate Authority to use when verifying -# HTTPs connections. Defaults to system CAs. (string value) -#cafile= - -# Verify HTTPS connections. (boolean value) -#insecure=false - -# Directory used to cache files related to PKI tokens (string -# value) -#signing_dir= - -# Optionally specify a list of memcached server(s) to use for -# caching. If left undefined, tokens will instead be cached -# in-process. (list value) -# Deprecated group/name - [DEFAULT]/memcache_servers -#memcached_servers= - -# In order to prevent excessive effort spent validating -# tokens, the middleware caches previously-seen tokens for a -# configurable duration (in seconds). Set to -1 to disable -# caching completely. (integer value) -#token_cache_time=300 - -# Determines the frequency at which the list of revoked tokens -# is retrieved from the Identity service (in seconds). A high -# number of revocation events combined with a low cache -# duration may significantly reduce performance. (integer -# value) -#revocation_cache_time=10 - -# (optional) if defined, indicate whether token data should be -# authenticated or authenticated and encrypted. Acceptable -# values are MAC or ENCRYPT. If MAC, token data is -# authenticated (with HMAC) in the cache. If ENCRYPT, token -# data is encrypted and authenticated in the cache. If the -# value is not one of these options or empty, auth_token will -# raise an exception on initialization. (string value) -#memcache_security_strategy= - -# (optional, mandatory if memcache_security_strategy is -# defined) this string is used for key derivation. (string -# value) -#memcache_secret_key= - -# (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- -# Catalog header. (boolean value) -#include_service_catalog=true - -# Used to control the use and type of token binding. Can be -# set to: "disabled" to not check token binding. "permissive" -# (default) to validate binding information if the bind type -# is of a form known to the server and ignore it if not. -# "strict" like "permissive" but if the bind type is unknown -# the token will be rejected. "required" any form of token -# binding is needed to be allowed. Finally the name of a -# binding method that must be present in tokens. (string -# value) -#enforce_token_bind=permissive - -# If true, the revocation list will be checked for cached -# tokens. This requires that PKI tokens are configured on the -# Keystone server. (boolean value) -#check_revocations_for_cached=false - -# Hash algorithms to use for hashing PKI tokens. This may be a -# single algorithm or multiple. The algorithms are those -# supported by Python standard hashlib.new(). The hashes will -# be tried in the order given, so put the preferred one first -# for performance. The result of the first hash will be stored -# in the cache. This will typically be set to multiple values -# only while migrating from a less secure algorithm to a more -# secure one. Once all the old tokens are expired this option -# should be set to a single value for better performance. -# (list value) -#hash_algorithms=md5 - - -[matchmaker_ring] - -# -# Options defined in oslo.messaging -# - -# Matchmaker ring file (JSON). (string value) -# Deprecated group/name - [DEFAULT]/matchmaker_ringfile -#ringfile=/etc/oslo/matchmaker_ring.json - - -[notification] - -# -# Options defined in ceilometer.notification -# - -# Acknowledge message when event persistence fails. (boolean -# value) -#ack_on_event_error=true - -# Save event details. (boolean value) -#store_events=false - -# Messaging URLs to listen for notifications. Example: -# transport://user:pass@host1:port[,hostN:portN]/virtual_host -# (DEFAULT/transport_url is used if empty) (multi valued) -#messaging_urls= - - -[publisher] - -# -# Options defined in ceilometer.publisher.utils -# - -# Secret value for signing metering messages. (string value) -# Deprecated group/name - [DEFAULT]/metering_secret -# Deprecated group/name - [publisher_rpc]/metering_secret -#metering_secret=change this or be hacked - - -[publisher_rpc] - -# -# Options defined in ceilometer.publisher.rpc -# - -# The topic that ceilometer uses for metering messages. -# (string value) -#metering_topic=metering - - -[service_credentials] - -# -# Options defined in ceilometer.service -# - -# User name to use for OpenStack service access. (string -# value) -#os_username=ceilometer - -# Password to use for OpenStack service access. (string value) -#os_password=admin - -# Tenant ID to use for OpenStack service access. (string -# value) -#os_tenant_id= - -# Tenant name to use for OpenStack service access. (string -# value) -#os_tenant_name=admin - -# Certificate chain for SSL validation. (string value) -#os_cacert= - -# Auth URL to use for OpenStack service access. (string value) -#os_auth_url=http://localhost:5000/v2.0 - -# Region name to use for OpenStack service endpoints. (string -# value) -#os_region_name= - -# Type of endpoint in Identity service catalog to use for -# communication with OpenStack services. (string value) -#os_endpoint_type=publicURL - -# Disables X.509 certificate validation when an SSL connection -# to Identity Service is established. (boolean value) -#insecure=false - - -[vmware] - -# -# Options defined in ceilometer.compute.virt.vmware.inspector -# - -# IP address of the VMware Vsphere host (string value) -#host_ip= - -# Username of VMware Vsphere (string value) -#host_username= - -# Password of VMware Vsphere (string value) -#host_password= - -# Number of times a VMware Vsphere API must be retried -# (integer value) -#api_retry_count=10 - -# Sleep time in seconds for polling an ongoing async task -# (floating point value) -#task_poll_interval=0.5 - -# Optional vim service WSDL location e.g -# http:///vimService.wsdl. Optional over-ride to -# default location for bug work-arounds (string value) -#wsdl_location= - - diff --git a/debian/changelog b/debian/changelog index f0ccf1d..75dcdc2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,38 +1,176 @@ -ceilometer (2014.2.b1-0ubuntu1) trusty; urgency=medium +ceilometer (2015.1~b1-0ubuntu3) vivid; urgency=medium - * Update to 2014.2 version: - - Update requirements + * Systemd enablement: + - d/*.service: Dropped in favor of template approach. + - d/control: Add dh-systemd and openstack-pkg-tools to BD's. + - d/rules: Enable use of pkgos, tidyup generated init files. + - d/*.init.in: Cherry pick and adapt pkgos template configurations from + Debian ceilometer package (thanks Thomas). + - d/*.upstart: Drop in preference to generated files. + * d/control,compat: Bump debhelper compat level to 9. - -- Daniil Trishkin Wed, 19 Nov 2014 12:22:28 +0300 + -- Corey Bryant Thu, 08 Jan 2015 14:19:46 -0500 -ceilometer (2014.2.b1-0ubuntu1) trusty; urgency=medium +ceilometer (2015.1~b1-0ubuntu2) vivid; urgency=medium - * Update to 2014.2.b1 version: - - Remove patches - - Update requirements - * Add ceilometer.conf.sample as source file + * Systemd integration: + - add the 6 systemd debian/*.service corresponding to the upstart jobs + - debian/control: add dh-systemd build-dep + - debian/rules: enables systemd helper + * debian/control: + - fix Vcs-Bzr to point to kilo + + -- Didier Roche Fri, 09 Jan 2015 13:22:50 +0100 + +ceilometer (2015.1~b1-0ubuntu1) vivid; urgency=medium + + [ Chuck Short ] + * Open up for vivid. + * debian/control: Update bzr branch. + * debian/control: Add python-oslo.conccurency, python-retrying, and + python-oslo.midddleware as a build dependency. + * debian/patches/fix-requirements.patch: Dropped no longer needed. + * debian/patches/skip-db-tests.patch: Refreshed + * debian/rules: Use oslo-config-generator to generate configuration + files. + * debian/control, debian/ceilometer-polling.upstart, + debian/ceilometer-polling.install, debian/ceilometer-polling.postrm: + Add polling service. + + [ Corey Bryant ] + * New upstream release. + - d/control: Align requirements with upstream. + - d/watch: Update uversionmangle for kilo beta naming. + * d/control: Bumped Standards-Version to 3.9.6. + + -- Corey Bryant Fri, 19 Dec 2014 07:54:44 -0500 + +ceilometer (2014.2-0ubuntu1) utopic; urgency=medium - -- Ivan Berezovskiy Fri, 04 Jul 2014 12:45:20 +0400 + * New upstream release. + + -- Chuck Short Thu, 16 Oct 2014 14:30:18 -0400 + +ceilometer (2014.2~rc3-0ubuntu1) utopic; urgency=medium + + [ Corey Bryant ] + * New upstream release candidate. + + -- Chuck Short Tue, 14 Oct 2014 12:57:54 -0400 + +ceilometer (2014.2~rc2-0ubuntu1) utopic; urgency=medium + + [ Corey Bryant ] + * New upstream release candidate (LP: #1377218): + - d/watch: Use tarballs.openstack.org, limit scope to versions + starting with numbers. + - d/control: Align version requirements with rc1. + - d/ceilometer-agent-ipmi.*: Add support for IPMI agent. + - d/ceilometer-common.install: Add support for ceilometer-rootwrap. + - d/ceilometer-agent-notification.postrm: Add missing postrm file. + - d/ceilometer-agent-central.upstart: Fix description. + - d/ceilometer-collector.upstart: Fix description. + - d/ceilometer-api.upstart: Fix description. + - d/tests/control: Add ceilometer-agent-ipmi to test. + - d/tests/test-daemons: Add ceilometer-agent-ipmi to test. + - d/ceilometer.conf.sample: Removed. Use generated config file. + - d/rules: Copy sample config file from etc/ rather than debian/. + - d/p/series: Add missing patches. + - d/p/skip-ubuntu-tests.patch: Rebased. + - d/p/fix-requirements.patch: Drop ordereddict and discover. + - d/p/fix-requirements.patch: Align with Ubuntu. + - d/rules: Generate sample ceilometer.conf and patch with log and + db connection defaults before before copying. + - d/p/default-*.patch: Dropped as unable to patch config file + pre-generation. + + [ James Page ] + * d/p/skip-ubuntu-tests.patch,skip-db-tests.patch: Rework unit test + patches to skip db2 and mongodb tests as not in Ubuntu main. + * d/control: Fixup accross->across typo. + * d/ceilometer-agent-ipmi.install: Install rootwrap filters for + ipmitool usage. + * d/control: Add dependency on ipmitool for ceilometer-agent-ipmi. + * d/ceilometer-common.logrotate: Add single common logrotate configuration, + inline with Debian (thanks Thomas) (LP: #1373617). -ceilometer (2014.1.1-0ubuntu1) trusty; urgency=medium + -- James Page Thu, 09 Oct 2014 17:48:38 +0100 - * Resynchronize with stable/icehouse (a1ec218) (LP: #1328134): - - [84635e6] Fix testing gate due to new keystoneclient release - - [c52904d] Fix network notifications of neutron bulk creation - - [06eb8bc] Sync kombu_reconnect_delay from Oslo - - [d247af3] Updated from global requirements - - [82eed26] Disable specifying alarm itself in combination rule - - [94c12fd] Adapt failing tests for latest wsme version - - [a1ec218] Use known protocol scheme in keystone tests +ceilometer (2014.2~b3-0ubuntu2) utopic; urgency=medium - -- Corey Bryant Mon, 09 Jun 2014 14:49:20 -0400 + * d/control: Tidy version requirements to align to b3, wrap-and-sort. + * d/control: Bump Standards-Version: 3.9.5, no changes. + * d/tests/*: Rename DEP-8 tests to comply with naming standards. + * d/*: wrap-and-sort. -ceilometer (2014.1-0ubuntu1.1) trusty; urgency=medium + -- James Page Thu, 18 Sep 2014 11:35:49 +0100 - * d/p/fix-requirements.patch: Drop required version of pecan to 0.3.0 - inline with the version that is provided in 14.04 (LP: #1317147). +ceilometer (2014.2~b3-0ubuntu1) utopic; urgency=medium + + [ Chuck Short ] + * New upstream release. + * debian/control: + - Dropped python-swift, python-nova, python-flask, python-msqldb, + python-simplejson, and python-kombu + - Added python-oslotest, python-oslo.utils, python-oslo.nessaging, + python-keystonemiddleware, python-tz, python-neutronclient, + python-posix-ipc, python-oslo.db, and python-hacking + - Bumped dependens on python-alembic, python-happybase, python-iso8601, + python-keystoneclient, python-novaclient, python-oslo.config, + python-swiftclient, python-pbr, python-pecan, python-stevedore, + python-six, python-testools + - Added versioned dependencies for python-croniter, python-httplib2, + python-jsonpath-rw, python-migrate, python-mock, python-mox, + python-msgpack, python-oslo.vmware, + - Renamed python-oslo.sphinx to python-oslosphinx. + * debian/patches/fix-requirements.patch: Dropped no longer needed. + * debian/rules: Temporarily disable tests. + * debian/pydist-overrides: Add pysnmp + * debian/ceilometer.conf.sample: Add sample configuration file + + [ James Page ] + * debian/ceilometer-common.install: Install missing api_paste.ini to + /etc/ceilometer. + + -- Chuck Short Mon, 15 Sep 2014 10:02:14 -0400 + +ceilometer (2014.2~b2-0ubuntu1) utopic; urgency=medium + + [ Chuck Short ] + * New upstream release. + * debian/rules: Re-enable tests. + * debian/paches/fix-requirements.patch: Refreshed + * debian/control: Add python-oslo.vmware + * debian/control: Add python-pysnmp4. + * debian/patches/skip-ubunu-tests.patch: Skip tests that are failing + in the buildds. + * debian/rules: Pipe tests through subunit. + + [ Gauvain Pocentek ] + * debian/patches/default-log-dir.patch: define a default log directory to + actually get logging to work + + -- Chuck Short Thu, 24 Jul 2014 14:41:58 -0400 + +ceilometer (2014.2~b1-0ubuntu2) utopic; urgency=medium + + * SECURITY UPDATE: X_AUTH_TOKEN disclosure + - debian/patches/CVE-2014-4615.patch: filter out token in + ceilometer/openstack/common/middleware/notifier.py. + - CVE-2014-4615 + + -- Marc Deslauriers Wed, 09 Jul 2014 14:48:47 -0400 + +ceilometer (2014.2~b1-0ubuntu1) trusty; urgency=medium + + * New upstream release. + * debian/control: Open up juno release + * debian/patches/fix-requirements.patch: Refreshed. + * debian/rules: Patch the ceilometer.conf.sample directly since + the configuration files are generated by a tool. + * debian/ceilometer-common.install: Drop sources.json. - -- James Page Fri, 16 May 2014 12:11:00 -0400 + -- Chuck Short Fri, 13 Jun 2014 13:20:35 -0400 ceilometer (2014.1-0ubuntu1) trusty; urgency=medium diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index b3aeabd..7ea2982 100644 --- a/debian/control +++ b/debian/control @@ -4,118 +4,134 @@ Priority: optional Maintainer: Chuck Short Build-Depends: alembic (>= 0.6.4), - debhelper (>= 8.0.0), + debhelper (>= 9~), + dh-systemd, + openstack-pkg-tools (>= 21~), python-all (>= 2.6), python-anyjson (>= 0.3.3), python-argparse, - python-babel (>= 0.9.6), + python-babel (>= 1.3), python-ceilometerclient (>= 1.0.6), + python-coverage (>= 3.6), python-croniter (>= 0.3.4), - python-coverage, python-docutils, python-eventlet (>= 0.15.2), python-fixtures (>= 0.3.14), - python-flask (>= 0.10), - python-flask (<< 1.0), python-glanceclient (>= 1:0.14.0), - python-httplib2, + python-hacking (>= 0.9.2), python-happybase (>= 0.5), python-happybase (<< 0.7) | python-happybase (>> 0.7), + python-httplib2 (>= 0.7.5), python-iso8601 (>= 0.1.9), python-jsonpath-rw (>= 1.2.0), python-jsonpath-rw (<< 2.0), python-jsonschema (>= 2.0.0), python-jsonschema (<< 3.0.0), python-keystoneclient (>= 1:0.11.1), python-keystonemiddleware (>= 1.0.0), - python-lxml (>= 2.3), python-lockfile (>= 0.8), + python-lxml (>= 2.3), python-migrate (>= 0.9.1), python-migrate (<< 0.9.2) | python-migrate (>> 0.9.2), - python-mock, - python-mox, + python-mock (>= 1.0), + python-mox (>= 0.5.3), python-msgpack (>= 0.4.0), python-mysqldb, python-netaddr (>= 0.7.12), + python-neutronclient (>= 2.3.6), python-neutronclient (<< 1:3.0.0), + python-nose, python-nova, python-novaclient (>= 1:2.18.0), - python-neutronclient (>= 2.3.6), + python-oslo.concurrency (>= 0.3.0), python-oslo.config (>= 1:1.4.0), + python-oslo.db (>= 1.1.0), + python-oslo.i18n (>= 1.0.0), + python-oslo.messaging (>= 1.4.0), python-oslo.messaging (<< 1.5.0) | python-oslo.messaging (>> 1.5.0), + python-oslo.middleware (>= 0.1.0), + python-oslo.rootwrap (>= 1.3.0), + python-oslo.serialization (>= 1.0.0), python-oslo.utils (>= 1.0.0), - python-oslo.i18n (>= 0.1.0), - python-oslo.sphinx, + python-oslo.vmware (>= 0.6.0), + python-oslosphinx (>= 2.2.0), + python-oslotest (>= 1.1.0), + python-pastedeploy (>= 1.5.0), python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0), - python-pecan (>= 0.5.0), - python-pymongo (>= 2.6), + python-pecan (>= 0.8.0), + python-posix-ipc, + python-pymongo (>= 2.5), + python-pysnmp4 (>= 4.2.1), python-pysnmp4 (<< 5.0.0), python-requests (>= 2.2.0), python-requests (<< 2.4.0) | python-requests (>> 2.4.0), - python-simplejson, - python-sphinx, - python-pastedeploy (>= 1.5.0), + python-retrying (>= 1.2.2), python-retrying (<< 1.3.0) | python-retrying (>> 1.3.0), + python-six (>= 1.7.0), + python-sphinx (>= 1.1.2), python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.8.99) | python-sqlalchemy (>> 0.9.7), python-sqlalchemy (<= 0.9.99), python-stevedore (>= 1.1.0), - python-subunit, - python-six (>= 1.7.0), - python-swift, - python-swiftclient (>= 2.2.0), + python-subunit (>= 0.0.18), + python-swiftclient (>= 1:2.2.0), + python-testrepository (>= 0.0.18), python-testscenarios (>= 0.4), - python-testtools (>= 0.9.32), + python-testtools (>= 0.9.34), + python-tooz (>= 0.9), + python-tz (>= 2010h), python-webob (>= 1.2.3), python-wsme (>= 0.6), python-yaml (>= 3.1.0), - testrepository (>= 0.0.17) -Standards-Version: 3.9.4 -Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/ceilometer/icehouse/files -Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/ceilometer/icehouse + subunit, + testrepository (>= 0.0.18) +Standards-Version: 3.9.6 +Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/ceilometer/kilo/files +Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/ceilometer/kilo Package: python-ceilometer Architecture: all Depends: - python-retrying (>= 1.2.2), python-retrying (<< 1.3.0) | python-retrying (>> 1.3.0), - python-oslo.rootwrap (>= 1.3.0), alembic (>= 0.6.4), python-anyjson (>= 0.3.3), python-argparse, - python-croniter (>= 0.3.4), python-ceilometerclient (>= 1.0.6), + python-croniter (>= 0.3.4), python-eventlet (>= 0.15.2), - python-flask (>= 0.10), python-flask (<< 1.0), python-glanceclient (>= 1:0.14.0), python-happybase (>= 0.5), python-happybase (<< 0.7) | python-happybase (>> 0.7), - python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.8.99) | python-sqlalchemy (>> 0.9.7), python-sqlalchemy (<= 0.9.99), python-iso8601 (>= 0.1.9), python-jsonpath-rw (>= 1.2.0), python-jsonpath-rw (<< 2.0), python-jsonschema (>= 2.0.0), python-jsonschema (<< 3.0.0), python-keystoneclient (>= 1:0.11.1), python-keystonemiddleware (>= 1.0.0), - python-lxml (>= 2.3), python-lockfile (>= 0.8), + python-lxml (>= 2.3), python-migrate (>= 0.9.1), python-migrate (<< 0.9.2) | python-migrate (>> 0.9.2), python-msgpack (>= 0.4.0), python-netaddr (>= 0.7.12), - python-neutronclient (>= 2.3.6), + python-neutronclient (>= 1:2.3.6), python-neutronclient (<< 1:3.0.0), python-novaclient (>= 1:2.18.0), + python-oslo.concurrency (>= 0.3.0), python-oslo.config (>= 1:1.4.0), - python-oslo.db (>= 1.0.0), - python-oslo.utils (>= 1.0.0), - python-oslo.messaging (>= 1.4.0), + python-oslo.db (>= 1.1.0), + python-oslo.i18n (>= 1.0.0), + python-oslo.messaging (>= 1.4.0), python-oslo.messaging (<< 1.5.0) | python-oslo.messaging (>> 1.5.0), python-oslo.middleware (>= 0.1.0), + python-oslo.rootwrap (>= 1.3.0), python-oslo.serialization (>= 1.0.0), + python-oslo.utils (>= 1.0.0), python-oslo.vmware (>= 0.6.0), + python-pastedeploy (>= 1.5.0), python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0), - python-pecan (>= 0.5.0), + python-pecan (>= 0.8.0), python-posix-ipc, - python-pymongo (>= 2.6), - python-six (>= 1.7.0), - python-tooz (>= 0.3), - python-yaml (>= 3.1.0), + python-pysnmp4 (>= 4.2.1), python-pysnmp4 (<< 5.0.0), + python-retrying (>= 1.2.2), python-retrying (<< 1.3.0) | python-retrying (>> 1.3.0), python-requests (>= 2.2.0), python-requests (<< 2.4.0) | python-requests (>> 2.4.0), + python-six (>= 1.7.0), + python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.8.99) | python-sqlalchemy (>> 0.9.7), python-sqlalchemy (<= 0.9.99), python-stevedore (>= 1.1.0), - python-swiftclient (>= 2.2.0), - python-tz, + python-swiftclient (>= 1:2.2.0), + python-tooz (>= 0.9), + python-tz (>= 2010h), python-webob (>= 1.2.3), python-wsme (>= 0.6), + python-yaml (>= 3.1.0), ${misc:Depends}, ${python:Depends} -Suggests: python-pysnmp4 Description: ceilometer python libraries Ceilometer aims to deliver a unique point of contact for billing systems to - aquire all counters they need to establish customer billing, accross all + aquire all counters they need to establish customer billing, across all current and future OpenStack components. The delivery of counters must be tracable and auditable, the counters must be easily extensible to support new projects, and agents doing data collections should be @@ -136,7 +152,7 @@ Depends: Provides: ${python:Provides} Description: ceilometer common files Ceilometer aims to deliver a unique point of contact for billing systems to - aquire all counters they need to establish customer billing, accross all + aquire all counters they need to establish customer billing, across all current and future OpenStack components. The delivery of counters must be tracable and auditable, the counters must be easily extensible to support new projects, and agents doing data collections should be @@ -155,7 +171,7 @@ Depends: Suggests: mongodb Description: ceilometer collector service Ceilometer aims to deliver a unique point of contact for billing systems to - aquire all counters they need to establish customer billing, accross all + aquire all counters they need to establish customer billing, across all current and future OpenStack components. The delivery of counters must be tracable and auditable, the counters must be easily extensible to support new projects, and agents doing data collections should be @@ -165,6 +181,25 @@ Description: ceilometer collector service . This package contains the collector service +Package: ceilometer-polling +Architecture: all +Depends: + ceilometer-common (= ${binary:Version}), + ${misc:Depends}, + ${python:Depends} +Suggests: mongodb +Description: ceilometer polling service + Ceilometer aims to deliver a unique point of contact for billing systems to + aquire all counters they need to establish customer billing, across all + current and future OpenStack components. The delivery of counters must + be tracable and auditable, the counters must be easily extensible to support + new projects, and agents doing data collections should be + independent of the overall system. + . + (A ceilometer is an instrument that measures cloud coverage.) + . + This package contains the polling service. + Package: ceilometer-api Architecture: all Depends: @@ -174,7 +209,7 @@ Depends: Suggests: mongodb Description: ceilometer api service Ceilometer aims to deliver a unique point of contact for billing systems to - aquire all counters they need to establish customer billing, accross all + aquire all counters they need to establish customer billing, across all current and future OpenStack components. The delivery of counters must be tracable and auditable, the counters must be easily extensible to support new projects, and agents doing data collections should be @@ -190,7 +225,7 @@ Depends: ${python:Depends} Description: ceilometer compute agent Ceilometer aims to deliver a unique point of contact for billing systems to - aquire all counters they need to establish customer billing, accross all + aquire all counters they need to establish customer billing, across all current and future OpenStack components. The delivery of counters must be tracable and auditable, the counters must be easily extensible to support new projects, and agents doing data collections should be @@ -208,7 +243,7 @@ Depends: ${python:Depends} Description: ceilometer central agent Ceilometer aims to deliver a unique point of contact for billing systems to - aquire all counters they need to establish customer billing, accross all + aquire all counters they need to establish customer billing, across all current and future OpenStack components. The delivery of counters must be tracable and auditable, the counters must be easily extensible to support new projects, and agents doing data collections should be @@ -218,6 +253,25 @@ Description: ceilometer central agent . This package contains the central agent. +Package: ceilometer-agent-ipmi +Architecture: all +Depends: + ceilometer-common (= ${binary:Version}), + ipmitool, + ${misc:Depends}, + ${python:Depends} +Description: ceilometer ipmi agent + Ceilometer aims to deliver a unique point of contact for billing systems to + aquire all counters they need to establish customer billing, across all + current and future OpenStack components. The delivery of counters must + be tracable and auditable, the counters must be easily extensible to support + new projects, and agents doing data collections should be + independent of the overall system. + . + (A ceilometer is an instrument that measures cloud coverage.) + . + This package contains the ipmi agent. + Package: ceilometer-agent-notification Architecture: all Depends: @@ -226,7 +280,7 @@ Depends: ${python:Depends} Description: ceilometer notification agent Ceilometer aims to deliver a unique point of contact for billing systems to - aquire all counters they need to establish customer billing, accross all + aquire all counters they need to establish customer billing, across all current and future OpenStack components. The delivery of counters must be tracable and auditable, the counters must be easily extensible to support new projects, and agents doing data collections should be @@ -244,7 +298,7 @@ Depends: ${python:Depends} Description: Ceilometer alarm evaluator Ceilometer aims to deliver a unique point of contact for billing systems to - aquire all counters they need to establish customer billing, accross all + aquire all counters they need to establish customer billing, across all current and future OpenStack components. The delivery of counters must be tracable and auditable, the counters must be easily extensible to support new projects, and agents doing data collections should be @@ -262,7 +316,7 @@ Depends: ${python:Depends} Description: Ceilometer notification agent Ceilometer aims to deliver a unique point of contact for billing systems to - aquire all counters they need to establish customer billing, accross all + aquire all counters they need to establish customer billing, across all current and future OpenStack components. The delivery of counters must be tracable and auditable, the counters must be easily extensible to support new projects, and agents doing data collections should be diff --git a/debian/patches/default-config.patch b/debian/patches/default-config.patch new file mode 100644 index 0000000..a64ff21 --- /dev/null +++ b/debian/patches/default-config.patch @@ -0,0 +1,20 @@ +--- etc/ceilometer/ceilometer.conf.sample 2014-10-09 17:27:51.497651569 +0100 ++++ etc/ceilometer/ceilometer.conf.sample.ubuntu 2014-10-09 17:27:31.565650862 +0100 +@@ -472,6 +472,7 @@ + # paths. (string value) + # Deprecated group/name - [DEFAULT]/logdir + #log_dir= ++log_dir=/var/log/ceilometer + + # Use syslog for logging. Existing syslog format is DEPRECATED + # during I, and will change in J to honor RFC5424. (boolean +@@ -714,6 +715,9 @@ + # (if unset, connection is used) (string value) + #alarm_connection= + ++# Provide backwards compatible default for both alarm and metering ++connection=sqlite:////var/lib/ceilometer/ceilometer.sqlite ++ + + [dispatcher_file] + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..44cee38 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +skip-db-tests.patch diff --git a/debian/patches/skip-db-tests.patch b/debian/patches/skip-db-tests.patch new file mode 100644 index 0000000..1e6816a --- /dev/null +++ b/debian/patches/skip-db-tests.patch @@ -0,0 +1,39 @@ +From d008622c43dc902e1bb73ea5ff08beb8ec48f7d9 Mon Sep 17 00:00:00 2001 +From: Chuck Short +Date: Fri, 21 Nov 2014 11:30:23 -0600 +Subject: [PATCH] skip-db + +Signed-off-by: Chuck Short +--- + ceilometer/tests/db.py | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/ceilometer/tests/db.py b/ceilometer/tests/db.py +index f29d4fe..8c09115 100644 +--- a/ceilometer/tests/db.py ++++ b/ceilometer/tests/db.py +@@ -268,13 +268,13 @@ class MixinTestsWithBackendScenarios(object): + scenarios_db = [db for db, _ in scenarios] + + # Insert default value for hbase test +- if 'hbase' not in scenarios_db: +- scenarios.append( +- ('hbase', {'db_url': 'hbase://__test__'})) ++ #if 'hbase' not in scenarios_db: ++ # scenarios.append( ++ # ('hbase', {'db_url': 'hbase://__test__'})) + + # Insert default value for db2 test +- if 'mongodb' in scenarios_db and 'db2' not in scenarios_db: +- scenarios.append( +- ('db2', {'db_url': os.environ.get('CEILOMETER_TEST_MONGODB_URL', +- '').replace('mongodb://', +- 'db2://')})) ++ #if 'mongodb' in scenarios_db and 'db2' not in scenarios_db: ++ # scenarios.append( ++ # ('db2', {'db_url': os.environ.get('CEILOMETER_TEST_MONGODB_URL', ++ # '').replace('mongodb://', ++ # 'db2://')})) +-- +2.1.0 + diff --git a/debian/pydist-overrides b/debian/pydist-overrides index 14ce6f5..4cd03a7 100644 --- a/debian/pydist-overrides +++ b/debian/pydist-overrides @@ -1,2 +1,3 @@ pymongo python-pymongo happybase +pysnmp diff --git a/debian/rules b/debian/rules index d8f3904..8bb4684 100755 --- a/debian/rules +++ b/debian/rules @@ -5,23 +5,37 @@ export HOME="$(CURDIR)/debian/test" +include /usr/share/openstack-pkg-tools/pkgos.make + %: - dh $@ --with python2 + dh $@ --with python2,systemd get-orig-source: uscan --verbose --force-download --rename --destdir=../build-area ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) override_dh_auto_test: - testr init && PYTHONPATH="$(CURDIR)" testr run || true + rm -rf .testrepository + testr init && \ + set -e && \ + TEMP_REZ=`mktemp -t` && \ + testr run --subunit 'tests\.(?!.*test_bin.*)' | tee $$TEMP_REZ | subunit2pyunit; \ + rm -f $$TEMP_REZ endif override_dh_install: - cp $(CURDIR)/debian/ceilometer.conf.sample etc/ceilometer/ceilometer.conf + oslo-config-generator --output-file etc/ceilometer/ceilometer.conf.sample \ + --namespace ceilometer \ + --namespace oslo.db \ + --namespace oslo.messaging \ + --namespace keystonemiddleware.auth_token +# patch -p0 < debian/patches/default-config.patch + cp etc/ceilometer/ceilometer.conf.sample etc/ceilometer/ceilometer.conf dh_install --fail-missing override_dh_auto_clean: dh_auto_clean - rm -f etc/ceilometer/ceilometer.conf + rm -f etc/ceilometer/ceilometer.conf etc/ceilometer/ceilometer.conf.sample rm -rf .testrepository rm -rf pbr*.egg + rm -f debian/*.init debian/*.service debian/*.upstart diff --git a/debian/tests/control b/debian/tests/control index 3c52bac..e85991d 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,2 +1,2 @@ -Tests: test_daemons test_python_ceilometer -Depends: python-ceilometer, ceilometer-common, ceilometer-collector, ceilometer-api, ceilometer-agent-compute, ceilometer-agent-central, ceilometer-agent-notification +Tests: test-daemons test-python-ceilometer +Depends: python-ceilometer, ceilometer-common, ceilometer-collector, ceilometer-api, ceilometer-agent-compute, ceilometer-agent-central, ceilometer-agent-ipmi, ceilometer-agent-notification diff --git a/debian/tests/test_daemons b/debian/tests/test-daemons similarity index 78% rename from debian/tests/test_daemons rename to debian/tests/test-daemons index 18d88a7..d8058bb 100644 --- a/debian/tests/test_daemons +++ b/debian/tests/test-daemons @@ -3,7 +3,7 @@ # Testing ceilometer-daemons #--------------------------- set -e -DAEMONS=('ceilometer-collector' 'ceilometer-api' 'ceilometer-agent-compute' 'ceilometer-agent-central', 'ceilometer-agent-notification') +DAEMONS=('ceilometer-collector' 'ceilometer-api' 'ceilometer-agent-compute' 'ceilometer-agent-central', 'ceilometer-agent-ipmi', 'ceilometer-agent-notification') for daemon in "${DAEMONS[@]}"; do if pidof -x $daemon > /dev/null; then diff --git a/debian/tests/test_python_ceilometer b/debian/tests/test-python-ceilometer similarity index 100% rename from debian/tests/test_python_ceilometer rename to debian/tests/test-python-ceilometer diff --git a/debian/watch b/debian/watch index 267f14e..75204bb 100755 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \ - https://launchpad.net/ceilometer/+download https://launchpad.net/ceilometer/.*/.*/.*/ceilometer-(.*)\.tar\.gz +opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/;s/\.0b/~b/" \ + http://tarballs.openstack.org/ceilometer ceilometer-(\d.*)\.tar\.gz -- 2.32.3