diff --git a/manifests/init.pp b/manifests/init.pp index 7390bc1c..b1900362 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -147,19 +147,6 @@ # === DEPRECATED PARAMETERS: # # [*alarm_history_time_to_live*] -# [*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 ceilometer( $http_timeout = '600', @@ -195,19 +182,6 @@ class ceilometer( $memcached_servers = $::os_service_default, # DEPRECATED PARAMETERS $alarm_history_time_to_live = undef, - $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) diff --git a/manifests/logging.pp b/manifests/logging.pp index bbad6b39..7a14b926 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -61,8 +61,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*] diff --git a/releasenotes/notes/drop_qpid-9951a68b9e35f1c2.yaml b/releasenotes/notes/drop_qpid-9951a68b9e35f1c2.yaml new file mode 100644 index 00000000..6cda35ff --- /dev/null +++ b/releasenotes/notes/drop_qpid-9951a68b9e35f1c2.yaml @@ -0,0 +1,3 @@ +--- +other: + - Drop all Qpid support, it was removed from Oslo in Mitaka. diff --git a/spec/classes/ceilometer_logging_spec.rb b/spec/classes/ceilometer_logging_spec.rb index 94e37b48..6ca1869e 100644 --- a/spec/classes/ceilometer_logging_spec.rb +++ b/spec/classes/ceilometer_logging_spec.rb @@ -17,8 +17,7 @@ describe 'ceilometer::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] ', @@ -96,7 +95,7 @@ describe 'ceilometer::logging' do true) is_expected.to contain_ceilometer_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_ceilometer_config('DEFAULT/fatal_deprecations').with_value( true)