Totally drop Qpid support

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

Change-Id: I2a3e61d21036471c6331e6388656a3e691d8bd4a
This commit is contained in:
Denis Egorenko 2016-04-18 14:17:19 +03:00
parent 98837d8259
commit 62a96ddad0
3 changed files with 3 additions and 5 deletions

View File

@ -38,7 +38,6 @@
# [*rpc_backend*]
# (optional) The rpc backend implementation to use, can be:
# rabbit (for rabbitmq)
# qpid (for qpid)
# zmq (for zeromq)
# Defaults to $::os_service_default
#

View File

@ -65,7 +65,7 @@
# Defaults to $::os_service_default
# 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',

View File

@ -17,8 +17,7 @@ describe 'barbican::api::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 'barbican::api::logging' do
true)
is_expected.to contain_barbican_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_barbican_config('DEFAULT/fatal_deprecations').with_value(
true)