openstack/puppet-magnum
Code Issues Proposed changes

Drop all qpid related explanations

Browse Source 
Qpid was removed in Mitaka from Oslo Messaging, so we
can remove all qpid related explanations.

Change-Id: I2eb9ca6ce880460217285e882ddae100acca476f
This commit is contained in:
ZhongShengping 2016-05-25 15:39:47 +08:00
parent 7f00f1c1bb
commit 9db1f9ac60
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/logging.pp
View File

@ -57,7 +57,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',
# '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',

5
spec/classes/magnum_logging_spec.rb
View File

@ -17,8 +17,7 @@ describe 'magnum::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] ',
@ -94,7 +93,7 @@ describe 'magnum::logging' do
true) true)
is_expected.to contain_magnum_config('DEFAULT/default_log_levels').with_value( is_expected.to contain_magnum_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_magnum_config('DEFAULT/fatal_deprecations').with_value( is_expected.to contain_magnum_config('DEFAULT/fatal_deprecations').with_value(
true) true)