Totally drop Qpid support

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

Change-Id: Ie33f82b278bdb685cf1c78b704725eb03be1a19e

manifests/api.pp

@@ -411,10 +411,6 @@ class trove::api(
     }
   }
 
-  if $::trove::rpc_backend == 'trove.openstack.common.rpc.impl_qpid' or $::trove::rpc_backend == 'qpid'{
-    warning('Qpid driver is removed from Oslo.messaging in the Mitaka release')
-  }
-
   trove::generic_service { 'api':
     enabled        => $enabled,
     manage_service => $manage_service,

manifests/conductor.pp

@@ -184,10 +184,6 @@ class trove::conductor(
     }
   }
 
-  if $::trove::rpc_backend == 'trove.openstack.common.rpc.impl_qpid' or $::trove::rpc_backend == 'qpid'{
-    warning('Qpid driver is removed from Oslo.messaging in the Mitaka release')
-  }
-
   # Logging
   if $log_file {
     trove_conductor_config {

manifests/guestagent.pp

@@ -162,10 +162,6 @@ class trove::guestagent(
     }
   }
 
-  if $::trove::rpc_backend == 'trove.openstack.common.rpc.impl_qpid' or $::trove::rpc_backend == 'qpid'{
-    warning('Qpid driver is removed from Oslo.messaging in the Mitaka release')
-  }
-
   # Logging
   if $log_file {
     trove_guestagent_config {

manifests/init.pp

@@ -101,7 +101,6 @@
 # [*rpc_backend*]
 #   (optional) The rpc backend implementation to use, can be:
 #     rabbit (for rabbitmq)
-#     qpid  (for qpid)
 #   Defaults to 'rabbit'
 #
 # [*database_connection*]
@@ -199,40 +198,6 @@
 #   (optional) The state of the package.
 #   Defaults to 'present'
 #
-# DEPRECATED PARAMETERS
-#
-# [*qpid_hostname*]
-#   (optional) Location of qpid server
-#   Defaults to undef
-#
-# [*qpid_port*]
-#   (optional) Port for qpid server
-#   Defaults to undef
-#
-# [*qpid_username*]
-#   (optional) Username to use when connecting to qpid
-#   Defaults to undef
-#
-# [*qpid_password*]
-#   (optional) Password to use when connecting to qpid
-#   Defaults to undef
-#
-# [*qpid_heartbeat*]
-#   (optional) Seconds between connection keepalive heartbeats
-#   Defaults to undef
-#
-# [*qpid_protocol*]
-#   (optional) Transport to use, either 'tcp' or 'ssl''
-#   Defaults to undef
-#
-# [*qpid_sasl_mechanisms*]
-#   (optional) Enable one or more SASL mechanisms
-#   Defaults to undef
-#
-# [*qpid_tcp_nodelay*]
-#   (optional) Disable Nagle algorithm
-#   Defaults to undef
-#
 class trove(
   $nova_proxy_admin_pass,
   $notification_driver          = 'noop',
@@ -275,15 +240,6 @@ class trove(
   $neutron_service_type         = 'network',
   $use_neutron                  = true,
   $package_ensure               = 'present',
-  # DEPRECATED PARAMETERS
-  $qpid_hostname                = undef,
-  $qpid_port                    = undef,
-  $qpid_username                = undef,
-  $qpid_password                = undef,
-  $qpid_sasl_mechanisms         = undef,
-  $qpid_heartbeat               = undef,
-  $qpid_protocol                = undef,
-  $qpid_tcp_nodelay             = undef,
 ) {
   include ::trove::deps
   include ::trove::params

manifests/logging.pp

@@ -66,8 +66,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*]

manifests/taskmanager.pp

@@ -226,10 +226,6 @@ class trove::taskmanager(
     }
   }
 
-  if $::trove::rpc_backend == 'trove.openstack.common.rpc.impl_qpid' or $::trove::rpc_backend == 'qpid'{
-    warning('Qpid driver is removed from Oslo.messaging in the Mitaka release')
-  }
-
   if $::trove::use_neutron {
     trove_config {
       'DEFAULT/network_label_regex':         value => '.*';

releasenotes/notes/drop_qpid-00ae0858778cae53.yaml

@@ -0,0 +1,3 @@
+---
+other:
+  - Drop all Qpid support, it was removed from Oslo in Mitaka.

spec/classes/trove_logging_spec.rb

@@ -17,8 +17,7 @@ describe 'trove::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] ',
@@ -100,7 +99,7 @@ describe 'trove::logging' do
         true)
 
       is_expected.to contain_trove_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_trove_config('DEFAULT/fatal_deprecations').with_value(
         true)