From c277f65ecb8e72f0c45f6d84884976966b74ef66 Mon Sep 17 00:00:00 2001 From: iberezovskiy Date: Sun, 15 Mar 2015 20:13:09 +0300 Subject: [PATCH] Fix requirements for 2014.2.2 version Update the dependencies according to https://github.com/openstack/requirements/blob/stable/juno/global-requirements.txt https://github.com/openstack/ceilometer/blob/stable/juno/requirements.txt Change-Id: Ia9a09042650f185177503a66e7879897610128c0 --- debian/README.Debian | 2 - debian/ceilometer-agent-central.install | 1 - debian/ceilometer-agent-central.postrm | 7 - debian/ceilometer-agent-central.upstart | 17 - debian/ceilometer-agent-compute.install | 1 - debian/ceilometer-agent-compute.postrm | 7 - debian/ceilometer-agent-compute.upstart | 17 - debian/ceilometer-agent-notification.install | 1 - debian/ceilometer-agent-notification.upstart | 17 - debian/ceilometer-alarm-evaluator.install | 1 - debian/ceilometer-alarm-evaluator.postrm | 10 - debian/ceilometer-alarm-evaluator.upstart | 17 - debian/ceilometer-alarm-notifier.install | 1 - debian/ceilometer-alarm-notifier.postrm | 10 - debian/ceilometer-alarm-notifier.upstart | 17 - debian/ceilometer-api.install | 1 - debian/ceilometer-api.postrm | 7 - debian/ceilometer-api.upstart | 17 - debian/ceilometer-collector.install | 1 - debian/ceilometer-collector.postrm | 7 - debian/ceilometer-collector.upstart | 17 - debian/ceilometer-common.dirs | 3 - debian/ceilometer-common.install | 11 - debian/ceilometer-common.postinst | 25 - debian/ceilometer.conf.sample | 1003 ------------------ debian/changelog | 359 ------- debian/compat | 1 - debian/control | 273 ----- debian/copyright | 45 - debian/docs | 1 - debian/pydist-overrides | 2 - debian/python-ceilometer.install | 1 - debian/rules | 27 - debian/source/format | 1 - debian/tests/control | 2 - debian/tests/test_daemons | 15 - debian/tests/test_python_ceilometer | 6 - debian/watch | 3 - rpm/SPECS/openstack-ceilometer.spec | 23 +- tests/runtests.sh | 4 +- trusty/debian/README.Debian | 2 - trusty/debian/changelog | 10 +- trusty/debian/control | 38 +- trusty/debian/watch | 3 - 44 files changed, 39 insertions(+), 1995 deletions(-) delete mode 100644 debian/README.Debian delete mode 100644 debian/ceilometer-agent-central.install delete mode 100644 debian/ceilometer-agent-central.postrm delete mode 100644 debian/ceilometer-agent-central.upstart delete mode 100644 debian/ceilometer-agent-compute.install delete mode 100644 debian/ceilometer-agent-compute.postrm delete mode 100644 debian/ceilometer-agent-compute.upstart delete mode 100644 debian/ceilometer-agent-notification.install delete mode 100644 debian/ceilometer-agent-notification.upstart delete mode 100644 debian/ceilometer-alarm-evaluator.install delete mode 100644 debian/ceilometer-alarm-evaluator.postrm delete mode 100644 debian/ceilometer-alarm-evaluator.upstart delete mode 100644 debian/ceilometer-alarm-notifier.install delete mode 100644 debian/ceilometer-alarm-notifier.postrm delete mode 100644 debian/ceilometer-alarm-notifier.upstart delete mode 100644 debian/ceilometer-api.install delete mode 100644 debian/ceilometer-api.postrm delete mode 100644 debian/ceilometer-api.upstart delete mode 100644 debian/ceilometer-collector.install delete mode 100644 debian/ceilometer-collector.postrm delete mode 100644 debian/ceilometer-collector.upstart delete mode 100644 debian/ceilometer-common.dirs delete mode 100644 debian/ceilometer-common.install delete mode 100644 debian/ceilometer-common.postinst delete mode 100644 debian/ceilometer.conf.sample delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/docs delete mode 100644 debian/pydist-overrides delete mode 100644 debian/python-ceilometer.install delete mode 100755 debian/rules delete mode 100644 debian/source/format delete mode 100644 debian/tests/control delete mode 100644 debian/tests/test_daemons delete mode 100644 debian/tests/test_python_ceilometer delete mode 100755 debian/watch delete mode 100644 trusty/debian/README.Debian delete mode 100755 trusty/debian/watch diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index ca0ec7d..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,2 +0,0 @@ -In order to configure both the agents and collector you have to put notification_topics 'notifications,glance_notifications' -in your /etc/nova/nova.conf. diff --git a/debian/ceilometer-agent-central.install b/debian/ceilometer-agent-central.install deleted file mode 100644 index 0902295..0000000 --- a/debian/ceilometer-agent-central.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ceilometer-agent-central diff --git a/debian/ceilometer-agent-central.postrm b/debian/ceilometer-agent-central.postrm deleted file mode 100644 index a8c06b6..0000000 --- a/debian/ceilometer-agent-central.postrm +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = purge ]; then - update-rc.d ceilometer-agent-central remove -fi - -#DEBHELPER# 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.install b/debian/ceilometer-agent-compute.install deleted file mode 100644 index 773283a..0000000 --- a/debian/ceilometer-agent-compute.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ceilometer-agent-compute diff --git a/debian/ceilometer-agent-compute.postrm b/debian/ceilometer-agent-compute.postrm deleted file mode 100644 index 1ef9152..0000000 --- a/debian/ceilometer-agent-compute.postrm +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = purge ]; then - update-rc.d ceilometer-agent-compute remove -fi - -#DEBHELPER# 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-notification.install b/debian/ceilometer-agent-notification.install deleted file mode 100644 index 1bcacec..0000000 --- a/debian/ceilometer-agent-notification.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ceilometer-agent-notification 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.install b/debian/ceilometer-alarm-evaluator.install deleted file mode 100644 index 22eb49f..0000000 --- a/debian/ceilometer-alarm-evaluator.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ceilometer-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.install b/debian/ceilometer-alarm-notifier.install deleted file mode 100644 index c0abb6a..0000000 --- a/debian/ceilometer-alarm-notifier.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ceilometer-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.install b/debian/ceilometer-api.install deleted file mode 100644 index 308a676..0000000 --- a/debian/ceilometer-api.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ceilometer-api diff --git a/debian/ceilometer-api.postrm b/debian/ceilometer-api.postrm deleted file mode 100644 index 2c434ad..0000000 --- a/debian/ceilometer-api.postrm +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = purge ]; then - update-rc.d ceilometer-api remove -fi - -#DEBHELPER# 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.install b/debian/ceilometer-collector.install deleted file mode 100644 index 9a114b9..0000000 --- a/debian/ceilometer-collector.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ceilometer-collector diff --git a/debian/ceilometer-collector.postrm b/debian/ceilometer-collector.postrm deleted file mode 100644 index 2ffb546..0000000 --- a/debian/ceilometer-collector.postrm +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = purge ]; then - update-rc.d ceilometer-collector remove -fi - -#DEBHELPER# 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.dirs b/debian/ceilometer-common.dirs deleted file mode 100644 index bce7e7b..0000000 --- a/debian/ceilometer-common.dirs +++ /dev/null @@ -1,3 +0,0 @@ -etc/ceilometer -var/lib/ceilometer -var/log/ceilometer diff --git a/debian/ceilometer-common.install b/debian/ceilometer-common.install deleted file mode 100644 index 9f58d52..0000000 --- a/debian/ceilometer-common.install +++ /dev/null @@ -1,11 +0,0 @@ -etc/ceilometer/ceilometer.conf 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 -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 -usr/bin/ceilometer-send-sample diff --git a/debian/ceilometer-common.postinst b/debian/ceilometer-common.postinst deleted file mode 100644 index 271dd31..0000000 --- a/debian/ceilometer-common.postinst +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = "configure" ]; then - if ! getent group ceilometer > /dev/null 2>&1; then - addgroup --system ceilometer >/dev/null - fi - - if ! getent passwd ceilometer > /dev/null 2>&1; then - adduser --system --home /var/lib/ceilometer --ingroup ceilometer --no-create-home --shell /bin/false ceilometer - fi - - chmod 0775 /var/log/ceilometer - chown -R ceilometer:ceilometer /var/lib/ceilometer /etc/ceilometer /var/log/ceilometer - - if grep -qE "^(sql_)?connection.*sqlite.*" /etc/ceilometer/ceilometer.conf - then - su -s /bin/sh -c '/usr/bin/ceilometer-dbsync' ceilometer - fi - - if [ -e /var/lib/ceilometer/ceilometer.sqlite ]; then - chown ceilometer:ceilometer /var/lib/ceilometer/ceilometer.sqlite - chmod 0600 /var/lib/ceilometer/ceilometer.sqlite - fi -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 deleted file mode 100644 index 9f003c4..0000000 --- a/debian/changelog +++ /dev/null @@ -1,359 +0,0 @@ -ceilometer (2014.2.2-0ubuntu1) trusty; urgency=medium - - * Update to 2014.2.2 version: - - Sync requirement with - https://github.com/openstack/ceilometer/blob/stable/juno/requirements.txt - - -- Ivan Berezovskiy Mon, 02 Mar 2015 13:03:39 +0300 - -ceilometer (2014.2.b1-0ubuntu1) trusty; urgency=medium - - * Update to 2014.2.b1 version: - - Remove patches - - Update requirements - * Add ceilometer.conf.sample as source file - - -- Ivan Berezovskiy Fri, 04 Jul 2014 12:45:20 +0400 - -ceilometer (2014.1.1-0ubuntu1) trusty; urgency=medium - - * 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 - - -- Corey Bryant Mon, 09 Jun 2014 14:49:20 -0400 - -ceilometer (2014.1-0ubuntu1.1) trusty; urgency=medium - - * 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). - - -- James Page Fri, 16 May 2014 12:11:00 -0400 - -ceilometer (2014.1-0ubuntu1) trusty; urgency=medium - - * New upstream release (LP: #1299055). - - -- Corey Bryant Wed, 16 Apr 2014 13:04:53 -0400 - -ceilometer (2014.1~rc3-0ubuntu1) trusty; urgency=medium - - * New upstream release candidate (LP: #1299055). - - -- Chuck Short Tue, 15 Apr 2014 20:29:38 -0400 - -ceilometer (2014.1~rc2-0ubuntu1) trusty; urgency=medium - - [ James Page ] - * d/ceilometer-common.postinst: Only run db sync process if default sqlite - connection is configured in /etc/ceilometer/ceilometer.conf (LP: #1182964). - - [ Chuck Short ] - * New upstream release (LP: #1299055). - - -- Chuck Short Tue, 08 Apr 2014 15:41:50 -0400 - -ceilometer (2014.1~rc1-0ubuntu1) trusty; urgency=medium - - * New upstream release. - - -- Corey Bryant Mon, 31 Mar 2014 11:50:09 -0400 - -ceilometer (2014.1~b3-0ubuntu3) trusty; urgency=medium - - * debian/patches/fix-requirements.patch: Explicity disable snmp. - - -- Chuck Short Thu, 20 Mar 2014 13:12:54 -0400 - -ceilometer (2014.1~b3-0ubuntu2) trusty; urgency=medium - - * d/p/default-dbconnection-sqlite.patch: Fix default sqlite connection URL. - * d/control: Fixup typo in notification agent description (LP: #1267127). - - -- James Page Thu, 13 Mar 2014 16:51:52 +0000 - -ceilometer (2014.1~b3-0ubuntu1) trusty; urgency=medium - - * New upstream release. - * debian/patches/debian/patches/default-dbconnection-sqlite.patch: Refreshed. - * debian/patches/fix-setup-requirements.patch: Dropped no longer needed. - * debian/patches/skip-database-tests.patch: Dropped no longer needed. - * debian/patches/revert-keystone-compat.patch: Dropped no longer needed. - * debian/control: - - Bump python-stevedore to 0.13. - - Add python-croniter as a build dependency. - - Suggest python-pysnmp4. - * debian/cielometer-common.install: Add ceilometer-sample - - -- Chuck Short Thu, 06 Mar 2014 14:44:28 -0500 - -ceilometer (2014.1~b2-0ubuntu1) trusty; urgency=medium - - [ James Page ] - * d/control: Add python-jsonpath-rw to BD's. - * d/p/fix-setup-requirements.patch: Bump WebOb to support < 1.4. - (LP: #1261101) - - [ Chuck Short ] - * New upstream version. - * debian/control, debian/ceilometer-common.install: Split out - ceilometer-alarm-evaluator and ceilometer-alarm-notifier into their - own packages. (LP: #1250002) - * debian/ceilometer-agent-central.logrotate, - debian/ceilometer-agent-compute.logrotate, - debian/ceilometer-api.logrotate, - debian/ceilometer-collector.logrotate: Add logrotate files, - thanks to Ahmed Rahal. (LP: #1224223) - * Fix typos in upstart files. - - -- Chuck Short Thu, 23 Jan 2014 15:08:11 -0500 - -ceilometer (2014.1~b1-0ubuntu1) trusty; urgency=low - - [ Chuck Short ] - * New upstream release. - * debian/control: - - Open icehouse release. - - Renamed msgpack-python to python-msgpack. - - Bump build dependency version for python-ceilometerclient, - python-novaclient, python-keystoneclient, python-six, - python-wsme. - * debian/patches/fix-setup-requirements.patch: Refreshed. - * debian/patches/skip-database-tests.patch: Refreshed. - * debian/rules: Temporarily disable testsuite. - - [ Yolanda Robla ] - * debian/patches/fix-setup-requirements.patch: Refreshed. - * debian/patches/default-dbconnection-sqlite.patch: Refreshed - * debian/ceilometer-collector.install: Removed usr/bin/ceilometer-collector-udp - * Added ceilometer-agent-notification package: - - debian/control: added ceilometer-agent-notification package - - debian/ceilometer-agent-notification.*: added install, upstart - - debian/tests: added ceilometer-agent-notification to tests - * debian/control: updated build-depends and depends versions - - [ James Page ] - * debian/control: Add missing BD on python-mysqldb. - - -- Chuck Short Thu, 05 Dec 2013 11:59:04 -0500 - -ceilometer (2013.2-0ubuntu1) saucy; urgency=low - - * New upstream release (LP: #1236462). - - -- Chuck Short Thu, 17 Oct 2013 09:38:31 -0400 - -ceilometer (2013.2~rc2-0ubuntu1) saucy; urgency=low - - * New upstream release candidate (LP: #1239156): - - d/p/revert-keystone-compat.patch: Revert keystoneclient 0.4.0 compat - fix as this causes test failures against 0.3.4. - * d/control: Drop a3 from versioned dependency on python-oslo.config. - - -- James Page Mon, 14 Oct 2013 10:30:03 +0100 - -ceilometer (2013.2~rc1-0ubuntu1) saucy; urgency=low - - * debian/patches/fix-setup-requirements.patch: Dropped no longer - needed. - * debian/patches/skip-database.patch: Refreshed - * debian/control: - - Add versioned dependency for python-pbr. - - Bump version dependency for python-webob. - - Add versioned dependency for alembic. - - Bump versioned dependency for python-sqlalchemy. - - Add versioned dependency for python-pymongo. - - Add versioned dependency for python-eventlet. - - Dropped python-extras dependency. - - Bump versioned dependency for python-flask. - - Bump versioned dependency for python-stevedore. - - Add versioned dependency for python-glanceclient. - - Bump versioned dependency for python-novaclient. - - Bump versioned dependency for python-keystoneclient. - - Bump versioned dependency for python-ceilometerclient. - - Add versioned dependency for python-lxml. - - Bump versioned dependency for python-wsme. - - Dropped python-netifaces dependency. - - Added python-httplib2 build dependency. - - Bump versioned dependency for python-fixtures. - - Bump versioned dependency for testrepository. - - Added versioned dependency for python-testtools. - - Added versioned dependency for python-swiftclient. - - Dropped python-cinderclient dependency. - - Dropped python-lockfile dependency. - - Dropped python-setuptoools-git dependency. - - Dropped python-unittest2 dependency. - - Dropped python-d2to1 dependency. - - Added versioned dependency for python-testtools. - - Added binary dependency for python-netaddr. - - Add python-six as a dependency. - * debian/patches/fix-setup-requirements.patch: Bump sqlachemy version. - * debian/ceilometer-common.install: - - Dropped ceilometer-alarm-singleton, no longer exists. - - Added usr/bin/ceilometer-alarm-evaluator. - - -- Chuck Short Thu, 03 Oct 2013 08:40:40 -0400 - -ceilometer (2013.2~b3-0ubuntu1) saucy; urgency=low - - [ Chuck Short ] - * New upstream release. - * debian/patches/fix-setup-requirements.patch: Refreshed - * debian/patches/skip-database.patch: Refreshed - - [ Yolanda Robla ] - * debian/control,debian/tests: Add basic autopkgtests. - - [ Adam Gandelman ] - * debian/patches/default-dbconnection-sqlite.patch: Set 'connection' flag - in [database] section, referencing 'sqlite_db' (LP: #1221956). - * debian/patches/skip-database-tests.patch: Also patch out db2 and hbase - scenarios in v2 test_statistics_scenarios.py. - * debian/rules: Clean python-pbr egg if it exists, set PYTHONPATH to build - dir when running tests. - - -- Chuck Short Sat, 07 Sep 2013 15:58:58 -0400 - -ceilometer (2013.2~b2-0ubuntu4) saucy; urgency=low - - * debian/patches/skip-database-tests.patch: Refreshed due to precise failures. - - -- Chuck Short Sun, 28 Jul 2013 21:58:31 -0400 - -ceilometer (2013.2~b2-0ubuntu3) saucy; urgency=low - - * debian/rules: Enable testsuite. - * debian/control: Fix up run time dependencies. - * debian/patches/fix-setup-requirements.patch: Refreshed - * debian/patches/skip-database-tests.patch: Refreshed - - -- Chuck Short Mon, 22 Jul 2013 15:17:35 -0400 - -ceilometer (2013.2~b2-0ubuntu2) saucy; urgency=low - - * debian/control: Fix sqlalchemy dependency. - - -- Chuck Short Fri, 19 Jul 2013 14:51:18 -0400 - -ceilometer (2013.2~b2-0ubuntu1) saucy; urgency=low - - [ Yolanda Robla ] - * debian/patches/default-dbconnection-sqlite.patch: updated db section - - [ Chuck Short ] - * New upstream version. - * debian/patches/default-dbconnection-sqlite.patch: Refreshed. - * debian/control: Bump requirements for stevedore to 0.9. - * debian/control: Add python-simplejson - * debian/control: Drop python-keystoneclient hardcoded version. - * debian/control: Add python-testscenarios as a build depends. - * debian/control: Add python-cinderclient as a build depends. - * debian/control: Add python-ceilometerclient as a build depends. - * debian/control: Add python-alembic as build depends. - * debian/control: Add python-oslo.sphinx as build-depends. - * debian/control: Update runtime depends. - * debian/control: Add python-happybase. - * debian/ceilometer-common.install: Add ceilometer-alarm-singleton, - ceilometer-alarm-notifier, and ceilometer-expirer. - * debian/patches/skip-database-tests.patch: Skip database tests - if the database is not installed. - - [ James Page ] - * d/control: Update VCS fields for new branch locations. - - -- Chuck Short Fri, 19 Jul 2013 10:04:36 -0400 - -ceilometer (2013.2~b1-0ubuntu1) saucy; urgency=low - - * New upstream release. - * debian/rules: Add fail-missing if binaries are missing - from the packages. - * debian/control: Add python-happybase as build-dependencies. - * debian/control: Add python-pbr and python-d2to1 as build-dependencies - * debian/control: Add python-fixtures as build-dependencies. - * debian/control: Add python-nova as build-dependencies. - * debian/control: Add python-testtools - * debian/control: Add msgpack-python. - * debian/patches/requests-dep.patch: Dropped no longer needed. - * debian/patches/remove-hbase-support.patch: Dropped no longer neded. - * debian/patches/default-dbconnection-sqlite.patch: Refreshed. - * debian/rules: Use testr instead of nosetests to run tests. - * debian/ceilometer-collector.install: Added usr/bin/ceilometer-collector-udp. - - -- Chuck Short Fri, 31 May 2013 10:29:16 -0500 - -ceilometer (2013.1-0ubuntu1) raring; urgency=low - - * New upstream release. - - -- Chuck Short Fri, 05 Apr 2013 14:34:37 -0500 - -ceilometer (2013.1~rc1-0ubuntu1) raring; urgency=low - - [ Chuck Short ] - * New upstream release. - * debian/watch: point to the right releases. - * debian/rules: Enable testsuite. - * debian/ceilometer-agent-compute.postinst: Add smarts to - configure users after install. - * debian/ceilometer-common.postinst: Configure ceilometer db. - * debian/ceilometer-common.install: Install configuration files. - * debian/*.upstart: Update and use start-stop-daemon. - - [ James Page ] - * Added watch file. - * d/rules: Fixup test suite execution as much as possible: - - Set PYTHONPATH to CURDIR during execution. - - Provide HOME directory for keystone tests. - - Override clean to tidy up after execution. - * d/control: Tidied BD's: - - Drop python-ming (not the right ming). - - python-oslo-config -> python-oslo.config. - - Dropped misc other surplus/duplicate dependencies. - - Wrapped and sorted. - * d/p/request-dep.patch: Remove upper bound on python-requests inline with - the rest of OpenStack. - * d/p/remove-hbase-support.patch: Remove happybase dependency. - * d/control: Bumped Standards-Version, no changes. - - [ Yolanda Robla ] - * d/rules: Copy ceilometer.conf.sample to ceilometer.conf. - * d/ceilometer-common.install: Install ceilometer.conf and ceilometer-dbsync. - * d/ceilometer-common.postinst: fixing user/group creation. - * d/*.upstart: Fix upstart jobs. - * d/pydist-overrides: Correct pymongo and wsme package names. - * d/control: modified mongodb recommends to suggests (LP: #1131627). - * d/files: copying pipeline.yaml. - * d/control: fixed typo (LP: #1140309). - * d/patches/default-dbconnection-sqlite.patch: default db to sqlite - - -- Chuck Short Tue, 26 Mar 2013 11:23:03 -0500 - -ceilometer (0.1-0ubuntu2) raring; urgency=low - - * Fix typo in debian/control (ceioleter -> ceilometer) (LP: #1140309) - - -- Hans Joachim Desserud Sun, 03 Mar 2013 20:08:39 +0100 - -ceilometer (0.1-0ubuntu1) quantal; urgency=low - - * New upstream release. - - -- Chuck Short Fri, 12 Oct 2012 09:34:05 -0500 - -ceilometer (0~20121002-0ubuntu2) quantal; urgency=low - - * Fix two typos in dependencies in debian/control (LP: #1063244) - - -- Adam Conrad Sun, 07 Oct 2012 07:49:55 -0600 - -ceilometer (0~20121002-0ubuntu1) quantal; urgency=low - - * Initial release. - - -- Chuck Short Wed, 03 Oct 2012 13:00:29 -0500 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 45a4fb7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/debian/control b/debian/control deleted file mode 100644 index 7a859b4..0000000 --- a/debian/control +++ /dev/null @@ -1,273 +0,0 @@ -Source: ceilometer -Section: python -Priority: optional -Maintainer: Chuck Short -Build-Depends: - alembic (>= 0.6.4), - debhelper (>= 8.0.0), - python-all (>= 2.6), - python-anyjson (>= 0.3.3), - python-argparse, - python-babel (>= 0.9.6), - python-ceilometerclient (>= 1.0.6), - python-croniter (>= 0.3.4), - python-coverage, - python-docutils, - python-eventlet (>= 0.15.1), - python-fixtures (>= 0.3.14), - python-flask (>= 0.10), - python-flask (<< 1.0), - python-glanceclient (>= 1:0.14.0), - python-httplib2, - python-happybase (>= 0.5), python-happybase (<< 0.7) | python-happybase (>> 0.7), - 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.10.0), - python-keystonemiddleware (>= 1.0.0), - python-lxml (>= 2.3), - python-lockfile (>= 0.8), - python-migrate (>= 0.9.1), python-migrate (<< 0.9.2), - python-mock, - python-mox, - python-msgpack (>= 0.4.0), - python-mysqldb, - python-netaddr (>= 0.7.12), - python-nova, - python-novaclient (>= 1:2.18.0), - python-neutronclient (>= 2.3.6), - python-oslo.config (>= 1:1.4.0), - python-oslo.utils (>= 1.0.0), - python-oslo.i18n (>= 1.0.0), - python-oslo.sphinx, - 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-requests (>= 1.2.1), python-requests (<< 2.2.2), - python-simplejson, - python-sphinx, - python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99), - python-stevedore (>= 1.0.0), - python-subunit, - python-six (>= 1.7.0), - python-swift, - python-swiftclient (>= 2.2.0), - python-testscenarios (>= 0.4), - python-testtools (>= 0.9.32), - 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 - -Package: python-ceilometer -Architecture: all -Depends: - alembic (>= 0.6.4), - python-anyjson (>= 0.3.3), - python-argparse, - python-croniter (>= 0.3.4), - python-ceilometerclient (>= 1.0.6), - python-eventlet (>= 0.15.1), - python-glanceclient (>= 1:0.14.0), - python-happybase (>= 0.5), python-happybase (<< 0.7) | python-happybase (>> 0.7), - 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.10.0), - python-keystonemiddleware (>= 1.0.0), - python-lxml (>= 2.3), - python-lockfile (>= 0.8), - python-migrate (>= 0.9.1), python-migrate (<< 0.9.2), - python-msgpack (>= 0.4.0), - python-netaddr (>= 0.7.12), - python-neutronclient (>= 2.3.6), - python-novaclient (>= 1:2.18.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.serialization (>= 1.0.0), - python-oslo.vmware (>= 0.6.0), - python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0), - python-pecan (>= 0.5.0), - python-posix-ipc, - python-pymongo (>= 2.6), - python-six (>= 1.7.0), - python-tooz (>= 0.3), - python-yaml (>= 3.1.0), - python-requests (>= 1.2.1), python-requests (<< 2.2.2), - python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99), - python-stevedore (>= 1.0.0), - python-swiftclient (>= 2.2.0), - python-tz, - python-webob (>= 1.2.3), - python-wsme (>= 0.6), - ${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 - 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 python libraries that are needed for all parts - of ceilometer - -Package: ceilometer-common -Architecture: all -Depends: - adduser, - python-ceilometer (= ${binary:Version}), - ${misc:Depends}, - ${python: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 - 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 files that are needed for all parts of ceilometer - -Package: ceilometer-collector -Architecture: all -Depends: - ceilometer-common (= ${binary:Version}), - ${misc:Depends}, - ${python: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 - 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 collector service - -Package: ceilometer-api -Architecture: all -Depends: - ceilometer-common (= ${binary:Version}), - ${misc:Depends}, - ${python: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 - 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. - . - This package contains the api service - -Package: ceilometer-agent-compute -Architecture: all -Depends: - ceilometer-common (= ${binary:Version}), - ${misc: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 - 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 compute agent - -Package: ceilometer-agent-central -Architecture: all -Depends: - ceilometer-common (= ${binary:Version}), - ${misc: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 - 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 central agent. - -Package: ceilometer-agent-notification -Architecture: all -Depends: - ceilometer-common (= ${binary:Version}), - ${misc: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 - 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 notification agent. - -Package: ceilometer-alarm-evaluator -Architecture: all -Depends: - ceilometer-common (= ${binary:Version}), - ${misc: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 - 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 alarm evaluator daemon. - -Package: ceilometer-alarm-notifier -Architecture: all -Depends: - ceilometer-common (= ${binary:Version}), - ${misc: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 - 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 alarm notifier daemon. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index b113394..0000000 --- a/debian/copyright +++ /dev/null @@ -1,45 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: ceilometer -Source: https://github.com/stackforge/ceilometer - -Files: * -Copyright: 2012 New Dream Network, LLC (DreamHost) - 2012 eNovance - 2012 Red Hat Inc. - 2010 United States Government - 2011 Cloudscaling Group, Inc - 2011 OpenStack LLC. - 2012 Nicolas Barcet for Canonical -License: Apache-2 - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - . - http://www.apache.org/licenses/LICENSE-2.0 - . - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - . - On Debian-based systems the full text of the Apache version 2.0 license - can be found in `/usr/share/common-licenses/Apache-2.0'. - -Files: debian/* -Copyright: 2012 Canonical Ltd -License: Apache-2 - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - . - http://www.apache.org/licenses/LICENSE-2.0 - . - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - . - On Debian-based systems the full text of the Apache version 2.0 license - can be found in `/usr/share/common-licenses/Apache-2.0'. diff --git a/debian/docs b/debian/docs deleted file mode 100644 index a1320b1..0000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README.rst diff --git a/debian/pydist-overrides b/debian/pydist-overrides deleted file mode 100644 index 14ce6f5..0000000 --- a/debian/pydist-overrides +++ /dev/null @@ -1,2 +0,0 @@ -pymongo python-pymongo -happybase diff --git a/debian/python-ceilometer.install b/debian/python-ceilometer.install deleted file mode 100644 index 036c6b9..0000000 --- a/debian/python-ceilometer.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python*/dist-packages/* diff --git a/debian/rules b/debian/rules deleted file mode 100755 index d8f3904..0000000 --- a/debian/rules +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -export HOME="$(CURDIR)/debian/test" - -%: - dh $@ --with python2 - -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 -endif - -override_dh_install: - cp $(CURDIR)/debian/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 -rf .testrepository - rm -rf pbr*.egg diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/tests/control b/debian/tests/control deleted file mode 100644 index 3c52bac..0000000 --- a/debian/tests/control +++ /dev/null @@ -1,2 +0,0 @@ -Tests: test_daemons test_python_ceilometer -Depends: python-ceilometer, ceilometer-common, ceilometer-collector, ceilometer-api, ceilometer-agent-compute, ceilometer-agent-central, ceilometer-agent-notification diff --git a/debian/tests/test_daemons b/debian/tests/test_daemons deleted file mode 100644 index 18d88a7..0000000 --- a/debian/tests/test_daemons +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -#--------------------------- -# Testing ceilometer-daemons -#--------------------------- -set -e -DAEMONS=('ceilometer-collector' 'ceilometer-api' 'ceilometer-agent-compute' 'ceilometer-agent-central', 'ceilometer-agent-notification') - -for daemon in "${DAEMONS[@]}"; do - if pidof -x $daemon > /dev/null; then - echo "OK" - else - echo "ERROR: ${daemon} IS NOT RUNNING" - exit 1 - fi -done diff --git a/debian/tests/test_python_ceilometer b/debian/tests/test_python_ceilometer deleted file mode 100644 index 2f07bf1..0000000 --- a/debian/tests/test_python_ceilometer +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/python -#------------------------- -# Testing client utilities -#------------------------- -import ceilometer -print "Imported ceilometer module OK" diff --git a/debian/watch b/debian/watch deleted file mode 100755 index 267f14e..0000000 --- a/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \ - https://launchpad.net/ceilometer/+download https://launchpad.net/ceilometer/.*/.*/.*/ceilometer-(.*)\.tar\.gz diff --git a/rpm/SPECS/openstack-ceilometer.spec b/rpm/SPECS/openstack-ceilometer.spec index b3aae08..47cc444 100644 --- a/rpm/SPECS/openstack-ceilometer.spec +++ b/rpm/SPECS/openstack-ceilometer.spec @@ -60,7 +60,7 @@ Group: Applications/System Requires: python-qpid -Requires: python-babel +Requires: python-babel >= 1.3 Requires: python-eventlet >= 0.15.1, python-eventlet <= 0.15.2 Requires: python-iso8601 >= 0.1.9 Requires: python-lxml >= 2.3 @@ -80,7 +80,7 @@ Requires: python-lockfile == 0.8 Requires: python-netaddr >= 0.7.12 Requires: python-ordereddict < 1.2 Requires: python-pbr >= 0.6, python-pbr < 0.7, python-pbr > 0.7, python-pbr < 1.0 -Requires: python-requests >= 1.2.2, python-requests <= 2.2.1 +Requires: python-requests >= 2.1.0, python-requests <= 2.2.1 Requires: python-tooz >= 0.3 Requires: python-sqlalchemy >= 0.9.7, python-sqlalchemy <= 0.9.99 @@ -111,9 +111,9 @@ Requires: python-flask Requires: python-pecan >= 0.5.0 Requires: python-wsme >= 0.6 Requires: python-neutronclient >= 2.3.6, python-neutronclient < 3 -Requires: python-novaclient >= 2.18.0 -Requires: python-keystoneclient >= 0.10.0 -Requires: python-glanceclient >= 0.14.0 +Requires: python-novaclient >= 1:2.18.0 +Requires: python-keystoneclient >= 1:0.10.0 +Requires: python-glanceclient >= 1:0.14.0 Requires: python-swiftclient >= 2.2.0 Requires: python-ceilometerclient >= 1.0.6 Requires: libvirt-python @@ -152,8 +152,8 @@ Group: Applications/System Requires: %{name}-common = %{version}-%{release} -Requires: python-novaclient >= 2.18.0 -Requires: python-keystoneclient >= 0.10.0 +Requires: python-novaclient >= 1:2.18.0 +Requires: python-keystoneclient >= 1:0.10.0 Requires: libvirt-python %description compute @@ -170,9 +170,9 @@ Group: Applications/System Requires: %{name}-common = %{version}-%{release} -Requires: python-novaclient >= 2.18.0 -Requires: python-keystoneclient >= 0.10.0 -Requires: python-glanceclient >= 0.14.0 +Requires: python-novaclient >= 1:2.18.0 +Requires: python-keystoneclient >= 1:0.10.0 +Requires: python-glanceclient >= 1:0.14.0 Requires: python-swiftclient >= 2.2.0 %description central @@ -569,6 +569,9 @@ fi %changelog +* Sun Mar 15 2015 Ivan Berezovskiy - 2014.2.2 +- New update of requirements for current 2014.2.2 version + * Mon Mar 2 2015 Ivan Berezovskiy - 2014.2.2 - Update spec and requirements for current 2014.2.2 version https://github.com/openstack/ceilometer/blob/stable/juno/requirements.txt diff --git a/tests/runtests.sh b/tests/runtests.sh index e9efc14..d4f83e9 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -42,9 +42,9 @@ connection=sqlite:////tmp/ceilometer" > /etc/ceilometer/ceilometer.conf prepare_vm() { if [[ `cat /etc/*-release | head -n 1 | awk '{print $1}'` =~ Ubuntu ]]; then - apt-get install screen python-pip sqlite3 -y + apt-get install screen python-pip sqlite3 curl -y else - yum install screen python-pip sqlite -y + yum install screen python-pip sqlite curl -y fi } diff --git a/trusty/debian/README.Debian b/trusty/debian/README.Debian deleted file mode 100644 index ca0ec7d..0000000 --- a/trusty/debian/README.Debian +++ /dev/null @@ -1,2 +0,0 @@ -In order to configure both the agents and collector you have to put notification_topics 'notifications,glance_notifications' -in your /etc/nova/nova.conf. diff --git a/trusty/debian/changelog b/trusty/debian/changelog index fa82acd..e2c317b 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,7 +1,15 @@ +ceilometer (2014.2.2-fuel6.1-14.04-2) trusty; urgency=medium + + * Sync requirements with global + https://github.com/openstack/requirements/blob/stable/juno/global-requirements.txt + https://github.com/openstack/ceilometer/blob/stable/juno/requirements.txt + + -- Ivan Berezovskiy Sun, 15 Mar 2015 20:11:41 +0300 + ceilometer (2014.2.2-fuel6.1-14.04-1) trusty; urgency=medium * Build ceilometer for Ubuntu 14.04 - * Update to 2014.2.b2 version + * Update to 2014.2.2 version -- Ivan Berezovskiy Wed, 18 Feb 2015 17:46:31 +0300 diff --git a/trusty/debian/control b/trusty/debian/control index 41300bf..55f836d 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -4,11 +4,10 @@ Priority: optional Maintainer: MOS Ceilometer Team Build-Depends: alembic (>= 0.6.4), - debhelper (>= 8.0.0), - python-all (>= 2.6), + debhelper (>= 9), + python-all (>= 2.7.1), python-anyjson (>= 0.3.3), - python-argparse, - python-babel (>= 0.9.6), + python-babel (>= 1.3), python-ceilometerclient (>= 1.0.6), python-croniter (>= 0.3.4), python-coverage, @@ -16,19 +15,16 @@ Build-Depends: python-eventlet (>= 0.15.1), python-fixtures (>= 0.3.14), python-flask (>= 0.10), - python-flask (<< 1.0), python-glanceclient (>= 1:0.14.0), python-httplib2, python-happybase (>= 0.7.1), 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.10.0), python-keystonemiddleware (>= 1.0.0), python-lxml (>= 2.3), - python-lockfile (>= 0.8), + python-lockfile (>= 1:0.8), python-migrate (>= 0.9.1), python-mock, python-mox, @@ -37,16 +33,16 @@ Build-Depends: python-netaddr (>= 0.7.12), python-nova, python-novaclient (>= 1:2.18.0), - python-neutronclient (>= 2.3.6), + python-neutronclient (>= 1:2.3.6), python-oslo.config (>= 1:1.4.0), - python-oslo.utils (>= 0.1.1), - python-oslo.i18n (>= 0.1.0), + python-oslo.utils (>= 1.0.0), + python-oslo.i18n (>= 1.0.0), python-oslo.sphinx, python-pastedeploy (>= 1.5.0), python-pbr (>= 0.10), python-pecan (>= 0.5.0), python-pymongo (>= 2.6), - python-requests (>= 1.2.1), + python-requests (>= 2.1.0), python-simplejson, python-sphinx, python-sqlalchemy (>= 0.9.7), @@ -54,13 +50,13 @@ Build-Depends: python-subunit, python-six (>= 1.7.0), python-swift (>= 2.2.0), - python-swiftclient (>= 2.2.0), + python-swiftclient (>= 1:2.2.0), python-testscenarios (>= 0.4), - python-testtools (>= 0.9.32), + python-testtools (>= 0.9.34), python-webob (>= 1.2.3), python-wsme (>= 0.6), python-yaml (>= 3.1.0), - testrepository (>= 0.0.17) + testrepository (>= 0.0.18) Standards-Version: 3.9.4 Package: python-ceilometer @@ -68,27 +64,23 @@ Architecture: all Depends: alembic (>= 0.6.4), python-anyjson (>= 0.3.3), - python-argparse, python-croniter (>= 0.3.4), python-ceilometerclient (>= 1.0.6), python-eventlet (>= 0.15.1), python-flask (>= 0.10), - python-flask (<< 1.0), python-glanceclient (>= 1:0.14.0), python-happybase (>= 0.7.1), 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.10.0), python-keystonemiddleware (>= 1.0.0), python-lxml (>= 2.3), - python-lockfile (>= 0.8), + python-lockfile (>= 1:0.8), python-migrate (>= 0.9.1), python-msgpack (>= 0.4.0), python-netaddr (>= 0.7.12), - python-neutronclient (>= 2.3.6), + python-neutronclient (>= 1:2.3.6), python-novaclient (>= 1:2.18.0), python-oslo.config (>= 1:1.4.0), python-oslo.db (>= 1.0.0), @@ -104,10 +96,10 @@ Depends: python-six (>= 1.7.0), python-tooz (>= 0.3), python-yaml (>= 3.1.0), - python-requests (>= 1.2.1), + python-requests (>= 2.1.0), python-sqlalchemy (>= 0.9.7), python-stevedore (>= 1.0.0), - python-swiftclient (>= 2.2.0), + python-swiftclient (>= 1:2.2.0), python-tz, python-webob (>= 1.2.3), python-wsme (>= 0.6), diff --git a/trusty/debian/watch b/trusty/debian/watch deleted file mode 100755 index 267f14e..0000000 --- a/trusty/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \ - https://launchpad.net/ceilometer/+download https://launchpad.net/ceilometer/.*/.*/.*/ceilometer-(.*)\.tar\.gz -- 2.32.3