Totally drop Qpid support

Qpid was removed in Mitaka from Oslo Messaging, so now we can
drop it in manifests.

Change-Id: I1c2682c1650fac8fab492be496ea242f0ed53597

diff --git a/manifests/init.pp b/manifests/init.pp
index 7390bc1cf1ec33af55b9f5ea968a81778e863580..b1900362ff76a29572187da7dc3113cdfc9ae03a 100644 (file)
--- 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 bbad6b39b5efce4f8b6956e2d7fa653435c0f382..7a14b9264483751ca201ec8d562080a3353a9765 100644 (file)
--- 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 (file)
index 0000000..6cda35f
--- /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 94e37b482a8f60ef730f3d0957665c0590de4f97..6ca1869e17e4076f22f9a556a41c54161daa7b08 100644 (file)
--- 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)