From b79dda880a5f71254d42872029500487f47037f8 Mon Sep 17 00:00:00 2001 From: Denis Egorenko Date: Mon, 18 Apr 2016 13:54:37 +0300 Subject: [PATCH] Totally drop Qpid support Qpid was removed in Mitaka from Oslo Messaging, so now we can drop it in manifests. Change-Id: I4c97e3dbf99465202870f9a6bbaa2daa415da6bf --- manifests/log.pp | 3 +-- spec/defines/oslo_log_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/manifests/log.pp b/manifests/log.pp index 67d28d3..1037b47 100644 --- a/manifests/log.pp +++ b/manifests/log.pp @@ -85,8 +85,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*] diff --git a/spec/defines/oslo_log_spec.rb b/spec/defines/oslo_log_spec.rb index 0b09588..d7d6e3d 100644 --- a/spec/defines/oslo_log_spec.rb +++ b/spec/defines/oslo_log_spec.rb @@ -50,7 +50,7 @@ describe 'oslo::log' do :logging_exception_prefix => '%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s', :logging_user_identity_format => '%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s', :default_log_levels => { - 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN','qpid' => 'WARN', 'sqlalchemy' => 'WARN', + 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN', 'requests.packages.urllib3.connectionpool' => 'WARN' }, :publish_errors => true, :instance_format => '[instance: %(uuid)s]', @@ -80,7 +80,7 @@ describe 'oslo::log' do is_expected.to contain_keystone_config('DEFAULT/logging_user_identity_format').with_value( '%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s') is_expected.to contain_keystone_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_keystone_config('DEFAULT/publish_errors').with_value(true) is_expected.to contain_keystone_config('DEFAULT/instance_format').with_value('[instance: %(uuid)s]') is_expected.to contain_keystone_config('DEFAULT/instance_uuid_format').with_value('[instance: %(uuid)s]')