Remove Qpid support

Qpid support was removed in OpenStack/Mitaka, but deprecated in
puppet-aodh. It's now totally removed in Newton.

Change-Id: Ic78193899d3483b6e28d7701091bb016a592a72b
This commit is contained in:
Emilien Macchi 2016-04-17 14:42:22 -04:00
parent 6dbaf7b603
commit e5eae81e30
4 changed files with 6 additions and 50 deletions

View File

@ -16,7 +16,6 @@
# [*rpc_backend*]
# (optional) The rpc backend implementation to use, can be:
# rabbit (for rabbitmq)
# qpid (for qpid)
# zmq (for zeromq)
# Defaults to 'rabbit'
#
@ -176,38 +175,6 @@
#
# DEPRECATED PARAMETERS
#
# [*qpid_hostname*]
# (optional) Location of qpid server
# Defaults to undef
#
# [*qpid_port*]
# (optional) Port for qpid server
# Defaults to undef
#
# [*qpid_username*]
# (optional) Username to use when connecting to qpid
# Defaults to undef
#
# [*qpid_password*]
# (optional) Password to use when connecting to qpid
# Defaults to undef
#
# [*qpid_heartbeat*]
# (optional) Seconds between connection keepalive heartbeats
# Defaults to undef
#
# [*qpid_protocol*]
# (optional) Transport to use, either 'tcp' or 'ssl''
# Defaults to undef
#
# [*qpid_sasl_mechanisms*]
# (optional) Enable one or more SASL mechanisms
# Defaults to undef
#
# [*qpid_tcp_nodelay*]
# (optional) Disable Nagle algorithm
# Defaults to undef
#
class aodh (
$ensure_package = 'present',
$alarm_history_time_to_live = $::os_service_default,
@ -246,14 +213,6 @@ class aodh (
$database_max_overflow = undef,
$gnocchi_url = $::os_service_default,
# DEPRECATED PARAMETERS
$qpid_hostname = undef,
$qpid_port = undef,
$qpid_username = undef,
$qpid_password = undef,
$qpid_sasl_mechanisms = undef,
$qpid_heartbeat = undef,
$qpid_protocol = undef,
$qpid_tcp_nodelay = undef,
) inherits aodh::params {
include ::aodh::db
@ -289,10 +248,6 @@ class aodh (
}
}
if $rpc_backend == 'qpid' {
warning('Qpid driver was removed from Oslo.messaging in Mitaka release')
}
oslo::messaging::notifications { 'aodh_config':
driver => $notification_driver,
topics => $notification_topics,

View File

@ -62,8 +62,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:
- Remove all Qpid support, it was deprecated in Mitaka.

View File

@ -17,8 +17,7 @@ describe 'aodh::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] ',
@ -97,7 +96,7 @@ describe 'aodh::logging' do
true)
is_expected.to contain_aodh_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_aodh_config('DEFAULT/fatal_deprecations').with_value(
true)