Remove qpid messaging support
Qpid messaging driver is removed from Oslo.messaging [1] Therefore, we cannot support it anymore. [1] I4a9cba314c4a2f24307504fa7b5427424268b114 Change-Id: I5a702aacf77956a6c616fd98d2f942654548f00d
This commit is contained in:
parent
f923a169e3
commit
dd53e39b11
@ -1,6 +1,7 @@
|
||||
# == Class: glance::notify::qpid
|
||||
#
|
||||
# used to configure qpid notifications for glance
|
||||
# Deprecated class
|
||||
#
|
||||
# === Parameters:
|
||||
#
|
||||
@ -24,20 +25,12 @@
|
||||
# Defaults to tcp.
|
||||
#
|
||||
class glance::notify::qpid(
|
||||
$qpid_password,
|
||||
$qpid_username = 'guest',
|
||||
$qpid_hostname = 'localhost',
|
||||
$qpid_port = '5672',
|
||||
$qpid_protocol = 'tcp'
|
||||
$qpid_password = undef,
|
||||
$qpid_username = undef,
|
||||
$qpid_hostname = undef,
|
||||
$qpid_port = undef,
|
||||
$qpid_protocol = undef
|
||||
) inherits glance::api {
|
||||
|
||||
glance_api_config {
|
||||
'DEFAULT/notifier_driver': value => 'qpid';
|
||||
'oslo_messaging_qpid/qpid_hostname': value => $qpid_hostname;
|
||||
'oslo_messaging_qpid/qpid_port': value => $qpid_port;
|
||||
'oslo_messaging_qpid/qpid_protocol': value => $qpid_protocol;
|
||||
'oslo_messaging_qpid/qpid_username': value => $qpid_username;
|
||||
'oslo_messaging_qpid/qpid_password': value => $qpid_password, secret => true;
|
||||
}
|
||||
|
||||
warning('Qpid driver is removed from Oslo.messaging in the Mitaka release')
|
||||
}
|
||||
|
@ -1,57 +0,0 @@
|
||||
require 'spec_helper'
|
||||
describe 'glance::notify::qpid' do
|
||||
let :facts do
|
||||
@default_facts.merge({
|
||||
:osfamily => 'Debian',
|
||||
})
|
||||
end
|
||||
|
||||
let :pre_condition do
|
||||
'class { "glance::api": keystone_password => "pass" }'
|
||||
end
|
||||
|
||||
describe 'when default params and qpid_password' do
|
||||
let :params do
|
||||
{:qpid_password => 'pass'}
|
||||
end
|
||||
|
||||
it { is_expected.to contain_glance_api_config('DEFAULT/notifier_driver').with_value('qpid') }
|
||||
it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_username').with_value('guest') }
|
||||
it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_password').with_value('pass') }
|
||||
it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_password').with_value(params[:qpid_password]).with_secret(true) }
|
||||
it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_hostname').with_value('localhost') }
|
||||
it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_port').with_value('5672') }
|
||||
it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_protocol').with_value('tcp') }
|
||||
end
|
||||
|
||||
describe 'when passing params' do
|
||||
let :params do
|
||||
{
|
||||
:qpid_password => 'pass2',
|
||||
:qpid_username => 'guest2',
|
||||
:qpid_hostname => 'localhost2',
|
||||
:qpid_port => '5673'
|
||||
}
|
||||
end
|
||||
it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_username').with_value('guest2') }
|
||||
it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_hostname').with_value('localhost2') }
|
||||
it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_port').with_value('5673') }
|
||||
it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_protocol').with_value('tcp') }
|
||||
end
|
||||
|
||||
describe 'when configuring with ssl' do
|
||||
let :params do
|
||||
{
|
||||
:qpid_password => 'pass3',
|
||||
:qpid_username => 'guest3',
|
||||
:qpid_hostname => 'localhost3',
|
||||
:qpid_port => '5671',
|
||||
:qpid_protocol => 'ssl'
|
||||
}
|
||||
end
|
||||
it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_username').with_value('guest3') }
|
||||
it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_hostname').with_value('localhost3') }
|
||||
it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_port').with_value('5671') }
|
||||
it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_protocol').with_value('ssl') }
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue
Block a user