diff --git a/manifests/messaging/amqp.pp b/manifests/messaging/amqp.pp
deleted file mode 100644
index 4e3e8b73e..000000000
--- a/manifests/messaging/amqp.pp
+++ /dev/null
@@ -1,60 +0,0 @@
-# Class keystone::messaging::amqp
-#
-# DEPRECATED !!
-# keystone messaging configuration
-#
-# == Parameters
-#
-# [*amqp_pre_settled*]
-#   (Optional) Send messages of this type pre-settled
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_idle_timeout*]
-#   (Optional) Timeout for inactive connections
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_ssl_ca_file*]
-#   (Optional) CA certificate PEM file to verify server certificate
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_ssl_cert_file*]
-#   (Optional) Identifying certificate PEM file to present to clients
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_ssl_key_file*]
-#   (Optional) Private key PEM file used to sign cert_file certificate
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_ssl_key_password*]
-#   (Optional) Password for decrypting ssl_key_file (if encrypted)
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_sasl_mechanisms*]
-#   (Optional) Space separated list of acceptable SASL mechanisms
-#   Defaults to $facts['os_service_default'].
-#
-class keystone::messaging::amqp(
-  $amqp_pre_settled                     = $facts['os_service_default'],
-  $amqp_idle_timeout                    = $facts['os_service_default'],
-  $amqp_ssl_ca_file                     = $facts['os_service_default'],
-  $amqp_ssl_cert_file                   = $facts['os_service_default'],
-  $amqp_ssl_key_file                    = $facts['os_service_default'],
-  $amqp_ssl_key_password                = $facts['os_service_default'],
-  $amqp_sasl_mechanisms                 = $facts['os_service_default'],
-) {
-
-  include keystone::deps
-
-  warning('The keystone::messaging::amqp class has been deprecated.')
-
-  oslo::messaging::amqp { 'keystone_config':
-    pre_settled      => $amqp_pre_settled,
-    idle_timeout     => $amqp_idle_timeout,
-    ssl_ca_file      => $amqp_ssl_ca_file,
-    ssl_cert_file    => $amqp_ssl_cert_file,
-    ssl_key_file     => $amqp_ssl_key_file,
-    ssl_key_password => $amqp_ssl_key_password,
-    sasl_mechanisms  => $amqp_sasl_mechanisms,
-  }
-
-}
diff --git a/releasenotes/notes/remove-amqp1-d68813864c39ddbb.yaml b/releasenotes/notes/remove-amqp1-d68813864c39ddbb.yaml
new file mode 100644
index 000000000..92a04e5eb
--- /dev/null
+++ b/releasenotes/notes/remove-amqp1-d68813864c39ddbb.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The deprecated ``keystone::messaging::amqp`` class has been removed.
diff --git a/spec/classes/keystone_messaging_amqp_spec.rb b/spec/classes/keystone_messaging_amqp_spec.rb
deleted file mode 100644
index 3e7f3d4fc..000000000
--- a/spec/classes/keystone_messaging_amqp_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-require 'spec_helper'
-
-describe 'keystone::messaging::amqp' do
-
-  shared_examples 'keystone messaging amqp' do
-    it { is_expected.to contain_class('keystone::messaging::amqp').with(
-      'amqp_pre_settled'            => ['<SERVICE DEFAULT>'],
-      'amqp_idle_timeout'           => '<SERVICE DEFAULT>',
-      'amqp_ssl_ca_file'            => '<SERVICE DEFAULT>',
-      'amqp_ssl_cert_file'          => '<SERVICE DEFAULT>',
-      'amqp_ssl_key_file'           => '<SERVICE DEFAULT>',
-      'amqp_ssl_key_password'       => '<SERVICE DEFAULT>',
-      'amqp_sasl_mechanisms'        => '<SERVICE DEFAULT>',
-    )}
-
-    context 'with specific parameters' do
-      let :params do
-        {
-          :amqp_pre_settled            => ['rpc-cast','rpc-reply','notify'],
-          :amqp_idle_timeout           => '100',
-          :amqp_sasl_mechanisms        => 'ANONYMOUS DIGEST-MD5 EXTERNAL PLAIN',
-        }
-      end
-
-      it { is_expected.to contain_class('keystone::messaging::amqp').with(
-        'amqp_pre_settled'            => ['rpc-cast','rpc-reply','notify'],
-        'amqp_idle_timeout'           => '100',
-        'amqp_sasl_mechanisms'        => 'ANONYMOUS DIGEST-MD5 EXTERNAL PLAIN',
-      )}
-    end
-
-    context 'with AMQP 1.0 communication SSLed' do
-      let :params do
-        {
-          :amqp_ssl_ca_file      => '/path/to/ssl/ca/certs',
-          :amqp_ssl_cert_file    => '/path/to/ssl/cert/file',
-          :amqp_ssl_key_file     => '/path/to/ssl/keyfile',
-          :amqp_ssl_key_password => '/path/to/ssl/pw_file',
-        }
-      end
-
-      it { is_expected.to contain_class('keystone::messaging::amqp').with(
-        'amqp_ssl_ca_file'      => '/path/to/ssl/ca/certs',
-        'amqp_ssl_cert_file'    => '/path/to/ssl/cert/file',
-        'amqp_ssl_key_file'     => '/path/to/ssl/keyfile',
-        'amqp_ssl_key_password' => '/path/to/ssl/pw_file',
-      )}
-    end
-
-  end
-
-  on_supported_os({
-    :supported_os => OSDefaults.get_supported_os
-  }).each do |os,facts|
-    context "on #{os}" do
-      let (:facts) do
-        facts.merge!(OSDefaults.get_facts())
-      end
-
-      it_behaves_like 'keystone messaging amqp'
-    end
-  end
-
-end