diff --git a/manifests/logging.pp b/manifests/logging.pp index 8136654..c5f53db 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -36,7 +36,7 @@ # Defaults to undef. # Example: # { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', -# 'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO', +# 'sqlalchemy' => 'WARN', 'suds' => 'INFO', # 'oslo.messaging' => 'INFO', 'iso8601' => 'WARN', # 'requests.packages.urllib3.connectionpool' => 'WARN', # 'urllib3.connectionpool' => 'WARN', diff --git a/releasenotes/notes/drop_qpid-a85c88e538b885f8.yaml b/releasenotes/notes/drop_qpid-a85c88e538b885f8.yaml new file mode 100644 index 0000000..6cda35f --- /dev/null +++ b/releasenotes/notes/drop_qpid-a85c88e538b885f8.yaml @@ -0,0 +1,3 @@ +--- +other: + - Drop all Qpid support, it was removed from Oslo in Mitaka. diff --git a/spec/classes/zaqar_logging_spec.rb b/spec/classes/zaqar_logging_spec.rb index 8257b2d..49a993c 100644 --- a/spec/classes/zaqar_logging_spec.rb +++ b/spec/classes/zaqar_logging_spec.rb @@ -17,8 +17,7 @@ describe 'zaqar::logging' do :publish_errors => true, :default_log_levels => { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', - 'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO', - 'iso8601' => 'WARN', + 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN', 'requests.packages.urllib3.connectionpool' => 'WARN' }, :fatal_deprecations => true, :instance_format => '[instance: %(uuid)s] ', @@ -60,7 +59,7 @@ describe 'zaqar::logging' do true) 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( true)