Remove deprecated qpid config/classes

qpid was removed in Mitaka and can be removed from puppet for Newton.

Change-Id: I65290fe3d2f798ef56a7450028472583dabac9e8

manifests/init.pp

@@ -52,9 +52,8 @@
 # [*rpc_backend*]
 #   (optional) The rpc backend implementation to use, can be:
 #     rabbit (for rabbitmq)
-#     qpid (for qpid)
 #     zmq (for zeromq)
-#   Defaults to 'rabbit'
+#   Defaults to $::os_service_default
 #
 # [*image_service*]
 #   (optional) Service used to search for and retrieve images.
@@ -313,38 +312,6 @@
 #
 # 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
-#
 # [*install_utilities*]
 #   (optional) Install nova utilities (Extra packages used by nova tools)
 #   Defaults to undef
@@ -421,14 +388,6 @@ class nova(
   $upgrade_level_scheduler            = undef,
   $use_ipv6                           = $::os_service_default,
   # 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,
   $install_utilities                  = undef,
 ) inherits nova::params {
 
@@ -563,12 +522,6 @@ class nova(
     nova_config { 'DEFAULT/rpc_backend': value => $rpc_backend }
   }
 
-  # we keep "nova.openstack.common.rpc.impl_qpid" for backward compatibility
-  # but since Icehouse, "qpid" is enough.
-  if $rpc_backend == 'nova.openstack.common.rpc.impl_qpid' or $rpc_backend == 'qpid' {
-    warning('Qpid driver is removed from Oslo.messaging in the Mitaka release')
-  }
-
   # SSL Options
   if $use_ssl {
     nova_config {

manifests/qpid.pp

@@ -1,36 +0,0 @@
-# == Class: nova::qpid
-#
-# Deprecated class for installing qpid server for nova
-#
-# === Parameters:
-#
-# [*enabled*]
-#   (optional) Whether to enable the service
-#   Defaults to true
-#
-# [*user*]
-#   (optional) The user to create in qpid
-#   Defaults to 'guest'
-#
-# [*password*]
-#   (optional) The password to create for the user
-#   Defaults to 'guest'
-#
-# [*file*]
-#   (optional) Sasl file for the user
-#   Defaults to '/var/lib/qpidd/qpidd.sasldb'
-#
-# [*realm*]
-#   (optional) Realm for the user
-#   Defaults to 'OPENSTACK'
-#
-class nova::qpid(
-  $enabled  = undef,
-  $user     = undef,
-  $password = undef,
-  $file     = undef,
-  $realm    = undef
-) {
-
-  warning('Qpid driver is removed from Oslo.messaging in the Mitaka release')
-}

metadata.json

@@ -32,7 +32,6 @@
   "description": "Installs and configures OpenStack Nova (Compute).",
   "dependencies": [
     { "name": "puppetlabs/apache", "version_requirement": ">=1.0.0 <2.0.0" },
-    { "name": "dprince/qpid", "version_requirement": ">=1.0.0 <2.0.0" },
     { "name": "duritong/sysctl", "version_requirement": ">=0.0.1 <1.0.0" },
     { "name": "openstack/cinder", "version_requirement": ">=8.0.0 <9.0.0" },
     { "name": "openstack/glance", "version_requirement": ">=8.0.0 <9.0.0" },

releasenotes/notes/remove_qpid_references-0ce3d525e7e32ae4.yaml

@@ -0,0 +1,4 @@
+---
+deprecations:
+  - Drop all qpid references in code since it's been
+    deprecated already.