openstack/puppet-keystone
Code Issues Proposed changes

Totally drop Qpid support

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

Change-Id: Ica56c344fac4505ebdf8c739334c9b0400a02c87
This commit is contained in:
Denis Egorenko 2016-04-18 13:58:56 +03:00
parent 768c627d86
commit 46ced6835c
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@ -307,7 +307,7 @@
# Default to undef # Default to undef
# #
# [*control_exchange*] # [*control_exchange*]
# (optional) AMQP exchange to connect to if using RabbitMQ or Qpid # (optional) AMQP exchange to connect to if using RabbitMQ
# (string value) # (string value)
# Default to $::os_service_default # Default to $::os_service_default
# #

2
manifests/logging.pp
View File

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

3
releasenotes/notes/drop_qpid-50eb89c1bec84504.yaml Normal file
View File

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

5
spec/classes/keystone_logging_spec.rb
View File

@ -17,8 +17,7 @@ describe 'keystone::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] ',
@ -99,7 +98,7 @@ describe 'keystone::logging' do
true) true)
is_expected.to contain_keystone_config('DEFAULT/default_log_levels').with_value( 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/fatal_deprecations').with_value( is_expected.to contain_keystone_config('DEFAULT/fatal_deprecations').with_value(
true) true)