openstack/puppet-zaqar
Code Issues Proposed changes

Totally drop Qpid support

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

Change-Id: I5eb5a0b7fc5be00cdd98ef922aa66da679d1cb0a
This commit is contained in:
Denis Egorenko 2016-04-18 14:20:43 +03:00
parent 376892da8e
commit ba00e81f17
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/logging.pp
View File

@ -36,7 +36,7 @@
# Defaults to undef. # Defaults to undef.
# Example: # Example:
# { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', # { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
# 'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO', # 'sqlalchemy' => 'WARN', 'suds' => 'INFO',
# 'oslo.messaging' => 'INFO', 'iso8601' => 'WARN', # 'oslo.messaging' => 'INFO', 'iso8601' => 'WARN',
# 'requests.packages.urllib3.connectionpool' => 'WARN', # 'requests.packages.urllib3.connectionpool' => 'WARN',
# 'urllib3.connectionpool' => 'WARN', # 'urllib3.connectionpool' => 'WARN',

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

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

5
spec/classes/zaqar_logging_spec.rb
View File

@ -17,8 +17,7 @@ describe 'zaqar::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] ',
@ -60,7 +59,7 @@ describe 'zaqar::logging' do
true) true)
is_expected.to contain_zaqar_config('DEFAULT/default_log_levels').with_value( is_expected.to contain_zaqar_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_zaqar_config('DEFAULT/fatal_deprecations').with_value( is_expected.to contain_zaqar_config('DEFAULT/fatal_deprecations').with_value(
true) true)