openstack
/
puppet-ceilometer
Code Issues Proposed changes

Totally drop Qpid support 

Qpid was removed in Mitaka from Oslo Messaging, so now we can
drop it in manifests.

Change-Id: I1c2682c1650fac8fab492be496ea242f0ed53597
This commit is contained in:
Denis Egorenko 2016-04-18 13:51:15 +03:00
parent 01668bfd32
commit e3c649f087
4 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manifests/init.pp
View File

@ -147,19 +147,6 @@
# === DEPRECATED PARAMETERS: # === DEPRECATED PARAMETERS:
# #
# [*alarm_history_time_to_live*] # [*alarm_history_time_to_live*]
# [*qpid_hostname*]
# [*qpid_port*]
# [*qpid_username*]
# [*qpid_password*]
# [*qpid_heartbeat*]
# [*qpid_protocol*]
# [*qpid_tcp_nodelay*]
# [*qpid_reconnect*]
# [*qpid_reconnect_timeout*]
# [*qpid_reconnect_limit*]
# [*qpid_reconnect_interval*]
# [*qpid_reconnect_interval_min*]
# [*qpid_reconnect_interval_max*]
# #
class ceilometer( class ceilometer(
$http_timeout = '600', $http_timeout = '600',
@ -195,19 +182,6 @@ class ceilometer(
$memcached_servers = $::os_service_default, $memcached_servers = $::os_service_default,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$alarm_history_time_to_live = undef, $alarm_history_time_to_live = undef,
$qpid_hostname = undef,
$qpid_port = undef,
$qpid_username = undef,
$qpid_password = undef,
$qpid_heartbeat = undef,
$qpid_protocol = undef,
$qpid_tcp_nodelay = undef,
$qpid_reconnect = undef,
$qpid_reconnect_timeout = undef,
$qpid_reconnect_limit = undef,
$qpid_reconnect_interval_min = undef,
$qpid_reconnect_interval_max = undef,
$qpid_reconnect_interval = undef,
) { ) {
validate_string($metering_secret) validate_string($metering_secret)

3
manifests/logging.pp
View File

@ -61,8 +61,7 @@
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# Example: # Example:
# { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', # { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
# 'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO', # 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN',
# 'iso8601' => 'WARN',
# 'requests.packages.urllib3.connectionpool' => 'WARN' } # 'requests.packages.urllib3.connectionpool' => 'WARN' }
# #
# [*publish_errors*] # [*publish_errors*]

3
releasenotes/notes/drop_qpid-9951a68b9e35f1c2.yaml Normal file
View File

@ -0,0 +1,3 @@
---
other:
- Drop all Qpid support, it was removed from Oslo in Mitaka.

5
spec/classes/ceilometer_logging_spec.rb
View File

@ -17,8 +17,7 @@ describe 'ceilometer::logging' do
:publish_errors => true, :publish_errors => true,
:default_log_levels => { :default_log_levels => {
'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN',
'iso8601' => 'WARN',
'requests.packages.urllib3.connectionpool' => 'WARN' }, 'requests.packages.urllib3.connectionpool' => 'WARN' },
:fatal_deprecations => true, :fatal_deprecations => true,
:instance_format => '[instance: %(uuid)s] ', :instance_format => '[instance: %(uuid)s] ',
@ -96,7 +95,7 @@ describe 'ceilometer::logging' do
true) true)
is_expected.to contain_ceilometer_config('DEFAULT/default_log_levels').with_value( is_expected.to contain_ceilometer_config('DEFAULT/default_log_levels').with_value(
'amqp=WARN,amqplib=WARN,boto=WARN,iso8601=WARN,qpid=WARN,requests.packages.urllib3.connectionpool=WARN,sqlalchemy=WARN,suds=INFO') 'amqp=WARN,amqplib=WARN,boto=WARN,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,sqlalchemy=WARN,suds=INFO')
is_expected.to contain_ceilometer_config('DEFAULT/fatal_deprecations').with_value( is_expected.to contain_ceilometer_config('DEFAULT/fatal_deprecations').with_value(
true) true)