Totally drop Qpid support

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

Change-Id: Ifb363f23c31b7d4c0b4330dda7636df51c933aa5
This commit is contained in:
Denis Egorenko 2016-04-18 13:43:38 +03:00
parent 0215b8bc23
commit 0197a5bb02
3 changed files with 5 additions and 4 deletions

View File

@ -61,8 +61,7 @@
# Defaults to $::os_service_default.
# Example:
# {'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' }
#
# [*publish_errors*]

View File

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

View File

@ -25,7 +25,6 @@ describe 'murano::logging' do
'amqp' => 'WARN',
'amqplib' => 'WARN',
'boto' => 'WARN',
'qpid' => 'WARN',
'sqlalchemy' => 'WARN',
'suds' => 'INFO',
'iso8601' => 'WARN',
@ -106,7 +105,7 @@ describe 'murano::logging' do
is_expected.to contain_murano_config('DEFAULT/log_config_append').with_value('/etc/murano/logging.conf')
is_expected.to contain_murano_config('DEFAULT/publish_errors').with_value(true)
is_expected.to contain_murano_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_murano_config('DEFAULT/fatal_deprecations').with_value(true)
is_expected.to contain_murano_config('DEFAULT/instance_format').with_value('[instance: %(uuid)s] ')