From 8c5cfdd2ea0c4ec76b4bd19331fb93c4265d3715 Mon Sep 17 00:00:00 2001 From: Denis Egorenko Date: Thu, 3 Dec 2015 19:17:35 +0300 Subject: [PATCH] Remove qpid messaging support Qpid messaging driver is removed from Oslo.messaging [1] Therefore, we cannot support it anymore. [1] I4a9cba314c4a2f24307504fa7b5427424268b114 Change-Id: I46f3681963b4a365f2c5cdd7f5f6168adb751551 --- manifests/init.pp | 48 ++++++++++----------------- spec/classes/ceilometer_init_spec.rb | 49 ---------------------------- 2 files changed, 17 insertions(+), 80 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 2cfdf09..1c8ca94 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -96,6 +96,8 @@ # (optional) A list of memcached server(s) to use for caching. # Defaults to undef # +# DEPRECATED PARAMETERS +# # [*qpid_hostname*] # [*qpid_port*] # [*qpid_username*] @@ -109,7 +111,6 @@ # [*qpid_reconnect_interval*] # [*qpid_reconnect_interval_min*] # [*qpid_reconnect_interval_max*] -# (optional) various QPID options # class ceilometer( $http_timeout = '600', @@ -140,19 +141,20 @@ class ceilometer( $kombu_ssl_keyfile = undef, $kombu_ssl_version = 'TLSv1', $memcached_servers = undef, - $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, + # 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, ) { validate_string($metering_secret) @@ -262,23 +264,7 @@ class ceilometer( # we keep "ceilometer.openstack.common.rpc.impl_qpid" for backward compatibility if $rpc_backend == 'ceilometer.openstack.common.rpc.impl_qpid' or $rpc_backend == 'qpid' { - - ceilometer_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') } # Once we got here, we can act as an honey badger on the rpc used. diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb index 7beccae..eb8672a 100644 --- a/spec/classes/ceilometer_init_spec.rb +++ b/spec/classes/ceilometer_init_spec.rb @@ -27,16 +27,6 @@ describe 'ceilometer' do } end - let :qpid_params do - { - :rpc_backend => 'qpid', - :qpid_hostname => 'localhost', - :qpid_port => 5672, - :qpid_username => 'guest', - :qpid_password => 'guest', - } - end - shared_examples_for 'ceilometer' do it 'configures time to live for events, meters and alarm histories' do @@ -78,12 +68,6 @@ describe 'ceilometer' do end end - context 'with qpid' do - before {params.merge!( qpid_params ) } - it_configures 'a ceilometer base installation' - it_configures 'qpid support' - end - end shared_examples_for 'a ceilometer base installation' do @@ -260,39 +244,6 @@ describe 'ceilometer' do end end - shared_examples_for 'qpid support' do - context("with default parameters") do - it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_reconnect').with_value(true) } - it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_reconnect_timeout').with_value('0') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_reconnect_limit').with_value('0') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_reconnect_interval_min').with_value('0') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_reconnect_interval_max').with_value('0') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_reconnect_interval').with_value('0') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_heartbeat').with_value('60') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_protocol').with_value('tcp') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_tcp_nodelay').with_value(true) } - end - - context("with mandatory parameters set") do - it { is_expected.to contain_ceilometer_config('DEFAULT/rpc_backend').with_value('qpid') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_hostname').with_value( params[:qpid_hostname] ) } - it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_port').with_value( params[:qpid_port] ) } - it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_username').with_value( params[:qpid_username]) } - it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_password').with_value(params[:qpid_password]) } - it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_password').with_value( params[:qpid_password] ).with_secret(true) } - end - - context("with legacy rpc_backend value") do - before { params.merge!( qpid_params ).merge!(:rpc_backend => 'ceilometer.openstack.common.rpc.impl_qpid') } - it { is_expected.to contain_ceilometer_config('DEFAULT/rpc_backend').with_value('ceilometer.openstack.common.rpc.impl_qpid') } - end - - context("failing if the rpc_backend is not present") do - before { params.delete( :rpc_backend) } - it { expect { is_expected.to raise_error(Puppet::Error) } } - end - end - shared_examples_for 'memcached support' do context "with memcached enabled" do before { params.merge!( -- 2.45.2