openstack/puppet-neutron
Code Issues Proposed changes

Remove qpid messaging support

Browse Source 
Qpid messaging driver is removed from Oslo.messaging [1]
Therefore, we cannot support it anymore.

[1] I4a9cba314c4a2f24307504fa7b5427424268b114

Change-Id: Ib18cb5b49195371704ae245d68318a870235b724
This commit is contained in:
Denis Egorenko
2015-12-03 20:25:45 +03:00
parent eaf2f39b90
commit 05273183c5
2 changed files with 31 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
manifests/init.pp
View File

@@ -189,21 +189,6 @@
# reconnect. See https://review.openstack.org/#/c/76686
# Defaults to '1.0'
#
# [*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*]
# (optional) various QPID options
#
# [*use_ssl*]
# (optinal) Enable SSL on the API server
# Defaults to false, not set
@@ -251,6 +236,22 @@
# by the user executing the agent
# Defaults to: /var/lib/neutron/lock
#
# 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 neutron (
$enabled = true,
$package_ensure = 'present',
@@ -293,19 +294,6 @@ class neutron (
$kombu_ssl_keyfile = $::os_service_default,
$kombu_ssl_version = 'TLSv1',
$kombu_reconnect_delay = '1.0',
$qpid_hostname = 'localhost',
$qpid_port = '5672',
$qpid_username = 'guest',
$qpid_password = 'guest',
$qpid_heartbeat = 60,
$qpid_protocol = 'tcp',
$qpid_tcp_nodelay = true,
$qpid_reconnect = true,
$qpid_reconnect_timeout = 0,
$qpid_reconnect_limit = 0,
$qpid_reconnect_interval_min = 0,
$qpid_reconnect_interval_max = 0,
$qpid_reconnect_interval = 0,
$use_ssl = false,
$cert_file = false,
$key_file = false,
@@ -317,6 +305,20 @@ class neutron (
$log_dir = '/var/log/neutron',
$state_path = '/var/lib/neutron',
$lock_path = '/var/lib/neutron/lock',
# DEPRECATED PARAMETERS
$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 ::neutron::params
@@ -471,21 +473,7 @@ class neutron (
}
if $rpc_backend == 'qpid' or $rpc_backend == 'neutron.openstack.common.rpc.impl_qpid' {
neutron_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;
'oslo_messaging_qpid/qpid_reconnect': value => $qpid_reconnect;
'oslo_messaging_qpid/qpid_reconnect_timeout': value => $qpid_reconnect_timeout;
'oslo_messaging_qpid/qpid_reconnect_limit': value => $qpid_reconnect_limit;
'oslo_messaging_qpid/qpid_reconnect_interval_min': value => $qpid_reconnect_interval_min;
'oslo_messaging_qpid/qpid_reconnect_interval_max': value => $qpid_reconnect_interval_max;
'oslo_messaging_qpid/qpid_reconnect_interval': value => $qpid_reconnect_interval;
}
warning('Qpid driver is removed from Oslo.messaging in the Mitaka release')
}
# SSL Options

50
spec/classes/neutron_init_spec.rb
View File

@@ -81,7 +81,6 @@ describe 'neutron' do
it_configures 'with service_plugins'
it_configures 'without memcache_servers'
it_configures 'with memcache_servers'
it_configures 'with qpid rpc backend'
end
shared_examples_for 'a neutron base installation' do
@@ -158,55 +157,6 @@ describe 'neutron' do
end
end
shared_examples_for 'with qpid rpc backend' do
before do
params.merge!({ :rpc_backend => 'qpid' })
end
it { is_expected.to contain_neutron_config('DEFAULT/rpc_backend').with_value('qpid') }
context 'when default params' do
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_username').with_value('guest') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_password').with_value('guest').with_secret(true) }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_hostname').with_value('localhost') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_port').with_value('5672') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_protocol').with_value('tcp') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_heartbeat').with_value('60') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_tcp_nodelay').with_value('true') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_reconnect').with_value('true') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_reconnect_timeout').with_value('0') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_reconnect_limit').with_value('0') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_reconnect_interval_min').with_value('0') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_reconnect_interval_max').with_value('0') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_reconnect_interval').with_value('0') }
end
context 'when passing params' do
before do
params.merge!({
:qpid_password => 'pass',
:qpid_username => 'guest2',
:qpid_hostname => 'localhost2',
:qpid_port => '5673',
:qpid_protocol => 'udp',
:qpid_heartbeat => '89',
:qpid_tcp_nodelay => 'false',
:qpid_reconnect => 'false',
})
end
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_username').with_value('guest2') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_password').with_value('pass').with_secret(true) }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_hostname').with_value('localhost2') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_port').with_value('5673') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_protocol').with_value('udp') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_heartbeat').with_value('89') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_tcp_nodelay').with_value('false') }
it { is_expected.to contain_neutron_config('oslo_messaging_qpid/qpid_reconnect').with_value('false') }
end
end
shared_examples_for 'with SSL socket options set' do
before do
params.merge!(