openstack/puppet-ironic
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: I2536cc611b29c1cb75b942cf8c103aafe8c1f49a
This commit is contained in:
Denis Egorenko 2016-04-18 14:07:47 +03:00
parent 516bb6cc2b
commit d0e53354b9
6 changed files with 9 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
manifests/init.pp
View File

@ -176,22 +176,6 @@
# Enable dbsync # Enable dbsync
# Defaults to true # Defaults to true
# #
# DEPRECATED PARAMETERS
#
# [*qpid_hostname*]
# [*qpid_port*]
# [*qpid_username*]
# [*qpid_password*]
# [*qpid_heartbeat*]
# [*qpid_protocol*]
# [*qpid_tcp_nodelay*]
# [*qpid_reconnect*]
# [*qpid_reconnect_timeout*]
# [*qpid_reconnect_limit*]
# [*qpid_reconnect_interval*]
# [*qpid_reconnect_interval_min*]
# [*qpid_reconnect_interval_max*]
#
class ironic ( class ironic (
$enabled = true, $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
@ -231,19 +215,6 @@ class ironic (
$sync_db = true, $sync_db = true,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$rabbit_user = undef, $rabbit_user = undef,
$qpid_hostname = undef,
$qpid_port = undef,
$qpid_username = undef,
$qpid_password = undef,
$qpid_heartbeat = undef,
$qpid_protocol = undef,
$qpid_tcp_nodelay = undef,
$qpid_reconnect = undef,
$qpid_reconnect_timeout = undef,
$qpid_reconnect_limit = undef,
$qpid_reconnect_interval_min = undef,
$qpid_reconnect_interval_max = undef,
$qpid_reconnect_interval = undef,
) { ) {
include ::ironic::logging include ::ironic::logging
@ -355,8 +326,4 @@ class ironic (
} }
} }
if $rpc_backend == 'ironic.openstack.common.rpc.impl_qpid' or $rpc_backend == 'qpid' {
warning('Qpid driver is removed from Oslo.messaging in the Mitaka release')
}
} }

3
manifests/inspector/logging.pp
View File

@ -61,8 +61,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', 'iso8601' => 'WARN',
# 'iso8601' => 'WARN',
# 'requests.packages.urllib3.connectionpool' => 'WARN' } # 'requests.packages.urllib3.connectionpool' => 'WARN' }
# #
# [*publish_errors*] # [*publish_errors*]

3
manifests/logging.pp
View File

@ -61,8 +61,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', 'iso8601' => 'WARN',
# 'iso8601' => 'WARN',
# 'requests.packages.urllib3.connectionpool' => 'WARN' } # 'requests.packages.urllib3.connectionpool' => 'WARN' }
# #
# [*publish_errors*] # [*publish_errors*]

3
releasenotes/notes/drop_qpid-5648277d914993c1.yaml Normal file
View File

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

5
spec/classes/ironic_inspector_logging_spec.rb
View File

@ -17,8 +17,7 @@ describe 'ironic::inspector::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] ',
@ -96,7 +95,7 @@ describe 'ironic::inspector::logging' do
true) true)
is_expected.to contain_ironic_inspector_config('DEFAULT/default_log_levels').with_value( is_expected.to contain_ironic_inspector_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_ironic_inspector_config('DEFAULT/fatal_deprecations').with_value( is_expected.to contain_ironic_inspector_config('DEFAULT/fatal_deprecations').with_value(
true) true)

5
spec/classes/ironic_logging_spec.rb
View File

@ -17,8 +17,7 @@ describe 'ironic::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] ',
@ -96,7 +95,7 @@ describe 'ironic::logging' do
true) true)
is_expected.to contain_ironic_config('DEFAULT/default_log_levels').with_value( is_expected.to contain_ironic_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_ironic_config('DEFAULT/fatal_deprecations').with_value( is_expected.to contain_ironic_config('DEFAULT/fatal_deprecations').with_value(
true) true)