From cfa7f0b44c7ed2fbde91b431bace1ccc892e46e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Albert?=
<stephane.albert@objectif-libre.com>
Date: Thu, 27 Aug 2015 14:37:37 +0200
Subject: [PATCH] Preparing 0.4.1 release
Change-Id: Ief9d8b01ef2813194a012f20bb2375fbd9e02f5b
---
etc/cloudkitty/cloudkitty.conf.sample | 75 ++++-----------------------
setup.cfg | 6 ++-
2 files changed, 14 insertions(+), 67 deletions(-)
diff --git a/etc/cloudkitty/cloudkitty.conf.sample b/etc/cloudkitty/cloudkitty.conf.sample
index ff717af4..cd127821 100644
--- a/etc/cloudkitty/cloudkitty.conf.sample
+++ b/etc/cloudkitty/cloudkitty.conf.sample
@@ -4,60 +4,6 @@
# From cloudkitty.common.config
#
-# Enables or disables inter-process locks. (boolean value)
-#disable_process_locking = false
-
-# Directory to use for lock files. (string value)
-#lock_path = <None>
-
-# 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
-
-# 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 = <None>
-
-# 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 = <None>
-
-# 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 = <None>
-
-# (Optional) The base directory used for relative --log-file paths.
-# (string value)
-# Deprecated group/name - [DEFAULT]/logdir
-#log_dir = <None>
-
-# 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
-
# Configuration file for WSGI definition of API. (string value)
#api_paste_config = api_paste.ini
@@ -114,8 +60,7 @@
# Size of RPC thread pool. (integer value)
#rpc_thread_pool_size = 64
-# The Drivers(s) to handle sending notifications. Possible values are
-# messaging, messagingv2, routing,log, test, noop (multi valued)
+# Driver or drivers to handle sending notifications. (multi valued)
#notification_driver =
# AMQP topic used for OpenStack notifications. (list value)
@@ -388,7 +333,7 @@
#memcache_pool_maxsize = 10
# (Optional) Socket timeout in seconds for communicating with a
-# memcached server. (integer value)
+# memcache server. (integer value)
#memcache_pool_socket_timeout = 3
# (Optional) Number of seconds a connection to memcached is held
@@ -396,10 +341,10 @@
#memcache_pool_unused_timeout = 60
# (Optional) Number of seconds that an operation will wait to get a
-# memcached client connection from the pool. (integer value)
+# memcache client connection from the pool. (integer value)
#memcache_pool_conn_get_timeout = 10
-# (Optional) Use the advanced (eventlet safe) memcached client pool.
+# (Optional) Use the advanced (eventlet safe) memcache client pool.
# The advanced pool will only work under python 2.x. (boolean value)
#memcache_use_advanced_pool = false
@@ -551,7 +496,8 @@
# Deprecated group/name - [amqp1]/trace
#trace = false
-# CA certificate PEM file to verify server certificate (string value)
+# CA certificate PEM file for verifing server certificate (string
+# value)
# Deprecated group/name - [amqp1]/ssl_ca_file
#ssl_ca_file =
@@ -581,7 +527,6 @@
#
# Use durable queues in AMQP. (boolean value)
-# Deprecated group/name - [DEFAULT]/amqp_durable_queues
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
#amqp_durable_queues = false
@@ -650,7 +595,6 @@
#
# Use durable queues in AMQP. (boolean value)
-# Deprecated group/name - [DEFAULT]/amqp_durable_queues
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
#amqp_durable_queues = false
@@ -739,9 +683,10 @@
#rabbit_ha_queues = false
# Number of seconds after which the Rabbit broker is considered down
-# if heartbeat's keep-alive fails (0 disable the heartbeat). (integer
-# value)
-#heartbeat_timeout_threshold = 60
+# if heartbeat's keep-alive fails (0 disables the heartbeat, >0
+# enables it. Enabling heartbeats requires kombu>=3.0.7 and
+# amqp>=1.4.0). EXPERIMENTAL (integer value)
+#heartbeat_timeout_threshold = 0
# How often times during the heartbeat_timeout_threshold we check the
# heartbeat. (integer value)
diff --git a/setup.cfg b/setup.cfg
index ffe8af9c..bee996ef 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
[metadata]
name = cloudkitty
-version = 0.1
-summary = OpenStack Rating and Usage Reporter
+version = 0.4.1
+summary = Rating as a Service component for OpenStack
description-file =
README.rst
author = OpenStack
@@ -16,6 +16,8 @@ classifier =
Programming Language :: Python
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
+ Programming Language :: Python :: 3
+ Programming Language :: Python :: 3.4
[files]
packages =