Remove qpid messaging support
Qpid messaging driver is removed from Oslo.messaging [1] Therefore, we cannot support it anymore. [1] I4a9cba314c4a2f24307504fa7b5427424268b114 Change-Id: I9c4c04cbe4451380f67be067b5831d80fad48524
This commit is contained in:
parent
3ebecd1a6f
commit
c86dd9741a
|
@ -89,38 +89,6 @@
|
|||
# (optional) Define queues as "durable" to rabbitmq.
|
||||
# Defaults to false
|
||||
#
|
||||
# [*qpid_hostname*]
|
||||
# (optional) Location of qpid server
|
||||
# Defaults to 'localhost'
|
||||
#
|
||||
# [*qpid_port*]
|
||||
# (optional) Port for qpid server
|
||||
# Defaults to '5672'
|
||||
#
|
||||
# [*qpid_username*]
|
||||
# (optional) Username to use when connecting to qpid
|
||||
# Defaults to 'guest'
|
||||
#
|
||||
# [*qpid_password*]
|
||||
# (optional) Password to use when connecting to qpid
|
||||
# Defaults to 'guest'
|
||||
#
|
||||
# [*qpid_heartbeat*]
|
||||
# (optional) Seconds between connection keepalive heartbeats
|
||||
# Defaults to 60
|
||||
#
|
||||
# [*qpid_protocol*]
|
||||
# (optional) Transport to use, either 'tcp' or 'ssl''
|
||||
# Defaults to 'tcp'
|
||||
#
|
||||
# [*qpid_sasl_mechanisms*]
|
||||
# (optional) Enable one or more SASL mechanisms
|
||||
# Defaults to false
|
||||
#
|
||||
# [*qpid_tcp_nodelay*]
|
||||
# (optional) Disable Nagle algorithm
|
||||
# Defaults to true
|
||||
#
|
||||
# [*log_dir*]
|
||||
# (optional) Directory where logs should be stored.
|
||||
# If set to boolean false, it will not log to any directory.
|
||||
|
@ -196,6 +164,40 @@
|
|||
# (optional) If set, use this value for max_overflow with sqlalchemy.
|
||||
# Defaults to: undef.
|
||||
#
|
||||
# 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',
|
||||
$rpc_backend = 'rabbit',
|
||||
|
@ -215,14 +217,6 @@ class aodh (
|
|||
$kombu_ssl_version = 'TLSv1',
|
||||
$kombu_reconnect_delay = '1.0',
|
||||
$amqp_durable_queues = false,
|
||||
$qpid_hostname = 'localhost',
|
||||
$qpid_port = '5672',
|
||||
$qpid_username = 'guest',
|
||||
$qpid_password = 'guest',
|
||||
$qpid_sasl_mechanisms = false,
|
||||
$qpid_heartbeat = 60,
|
||||
$qpid_protocol = 'tcp',
|
||||
$qpid_tcp_nodelay = true,
|
||||
$verbose = undef,
|
||||
$debug = undef,
|
||||
$use_syslog = undef,
|
||||
|
@ -238,6 +232,15 @@ class aodh (
|
|||
$database_max_retries = undef,
|
||||
$database_retry_interval = undef,
|
||||
$database_max_overflow = undef,
|
||||
# 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
|
||||
|
@ -330,30 +333,7 @@ class aodh (
|
|||
}
|
||||
|
||||
if $rpc_backend == 'qpid' {
|
||||
aodh_config {
|
||||
'oslo_messaging_qpid/qpid_hostname': value => $qpid_hostname;
|
||||
'oslo_messaging_qpid/qpid_port': value => $qpid_port;
|
||||
'oslo_messaging_qpid/qpid_username': value => $qpid_username;
|
||||
'oslo_messaging_qpid/qpid_password': value => $qpid_password, secret => true;
|
||||
'oslo_messaging_qpid/qpid_heartbeat': value => $qpid_heartbeat;
|
||||
'oslo_messaging_qpid/qpid_protocol': value => $qpid_protocol;
|
||||
'oslo_messaging_qpid/qpid_tcp_nodelay': value => $qpid_tcp_nodelay;
|
||||
}
|
||||
if is_array($qpid_sasl_mechanisms) {
|
||||
aodh_config {
|
||||
'oslo_messaging_qpid/qpid_sasl_mechanisms': value => join($qpid_sasl_mechanisms, ' ');
|
||||
}
|
||||
}
|
||||
elsif $qpid_sasl_mechanisms {
|
||||
aodh_config {
|
||||
'oslo_messaging_qpid/qpid_sasl_mechanisms': value => $qpid_sasl_mechanisms;
|
||||
}
|
||||
}
|
||||
else {
|
||||
aodh_config {
|
||||
'oslo_messaging_qpid/qpid_sasl_mechanisms': ensure => absent;
|
||||
}
|
||||
}
|
||||
warning('Qpid driver was removed from Oslo.messaging in Mitaka release')
|
||||
}
|
||||
|
||||
if $notification_driver {
|
||||
|
|
|
@ -210,66 +210,6 @@ describe 'aodh' do
|
|||
is_expected.to contain_aodh_config('oslo_messaging_rabbit/kombu_ssl_version').with_ensure('absent')
|
||||
end
|
||||
end
|
||||
|
||||
context 'with qpid rpc_backend' do
|
||||
let :params do
|
||||
{ :rpc_backend => 'qpid' }
|
||||
end
|
||||
|
||||
context 'with default parameters' do
|
||||
it 'configures qpid' do
|
||||
is_expected.to contain_aodh_config('DEFAULT/rpc_backend').with_value('qpid')
|
||||
is_expected.to contain_aodh_config('oslo_messaging_qpid/qpid_hostname').with_value('localhost')
|
||||
is_expected.to contain_aodh_config('oslo_messaging_qpid/qpid_port').with_value('5672')
|
||||
is_expected.to contain_aodh_config('oslo_messaging_qpid/qpid_username').with_value('guest')
|
||||
is_expected.to contain_aodh_config('oslo_messaging_qpid/qpid_password').with_value('guest').with_secret(true)
|
||||
is_expected.to contain_aodh_config('oslo_messaging_qpid/qpid_heartbeat').with_value('60')
|
||||
is_expected.to contain_aodh_config('oslo_messaging_qpid/qpid_protocol').with_value('tcp')
|
||||
is_expected.to contain_aodh_config('oslo_messaging_qpid/qpid_tcp_nodelay').with_value(true)
|
||||
end
|
||||
end
|
||||
|
||||
context 'with qpid_password parameter (without qpid_sasl_mechanisms)' do
|
||||
before do
|
||||
params.merge!({ :qpid_password => 'guest' })
|
||||
end
|
||||
it { is_expected.to contain_aodh_config('oslo_messaging_qpid/qpid_sasl_mechanisms').with_ensure('absent') }
|
||||
end
|
||||
|
||||
context 'with qpid_password parameter (with qpid_sasl_mechanisms)' do
|
||||
before do
|
||||
params.merge!({
|
||||
:qpid_password => 'guest',
|
||||
:qpid_sasl_mechanisms => 'A'
|
||||
})
|
||||
end
|
||||
it { is_expected.to contain_aodh_config('oslo_messaging_qpid/qpid_sasl_mechanisms').with_value('A') }
|
||||
end
|
||||
|
||||
context 'with qpid_password parameter (with array of qpid_sasl_mechanisms)' do
|
||||
before do
|
||||
params.merge!({
|
||||
:qpid_password => 'guest',
|
||||
:qpid_sasl_mechanisms => [ 'DIGEST-MD5', 'GSSAPI', 'PLAIN' ]
|
||||
})
|
||||
end
|
||||
it { is_expected.to contain_aodh_config('oslo_messaging_qpid/qpid_sasl_mechanisms').with_value('DIGEST-MD5 GSSAPI PLAIN') }
|
||||
end
|
||||
end
|
||||
|
||||
context 'with qpid rpc_backend with old parameter' do
|
||||
let :params do
|
||||
{ :rpc_backend => 'aodh.openstack.common.rpc.impl_qpid' }
|
||||
end
|
||||
it { is_expected.to contain_aodh_config('DEFAULT/rpc_backend').with_value('aodh.openstack.common.rpc.impl_qpid') }
|
||||
end
|
||||
|
||||
context 'with rabbitmq rpc_backend with old parameter' do
|
||||
let :params do
|
||||
{ :rpc_backend => 'aodh.openstack.common.rpc.impl_kombu' }
|
||||
end
|
||||
it { is_expected.to contain_aodh_config('DEFAULT/rpc_backend').with_value('aodh.openstack.common.rpc.impl_kombu') }
|
||||
end
|
||||
end
|
||||
|
||||
context 'on Debian platforms' do
|
||||
|
|
Loading…
Reference in New Issue