diff --git a/manifests/ceilometer.pp b/manifests/ceilometer.pp
deleted file mode 100644
index cdec5de3..00000000
--- a/manifests/ceilometer.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-# == Class: cinder::ceilometer
-#
-# DEPRECATED!
-# Setup Cinder to enable ceilometer can retrieve volume samples
-#
-# === Parameters
-#
-# [*notification_transport_url*]
-#   (Optional) A URL representing the messaging driver to use for notifications
-#   and its full configuration. Transport URLs take the form:
-#     transport://user:pass@host1:port[,hostN:portN]/virtual_host
-#   Defaults to undef
-#
-# [*notification_driver*]
-#   (Option) Driver or drivers to handle sending notifications.
-#   Defaults to undef
-#
-# [*notification_topics*]
-#   (Optional) AMQP topic used for OpenStack notifications
-#   Defaults to undef
-#
-class cinder::ceilometer (
-  $notification_transport_url = undef,
-  $notification_driver        = undef,
-  $notification_topics        = undef,
-) {
-
-  warning('cinder::ceilometer is deprecated and has no effect')
-}
diff --git a/manifests/init.pp b/manifests/init.pp
index de215c8e..2c2e3328 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -379,18 +379,10 @@ class cinder (
     control_exchange     => $control_exchange,
   }
 
-  # TODO(tobias-urdin): Remove pick's when cinder::ceilometer is removed.
-  $notification_transport_url_real = pick($cinder::ceilometer::notification_transport_url,
-                                          $notification_transport_url)
-  $notification_driver_real = pick($cinder::ceilometer::notification_driver,
-                                    $notification_driver)
-  $notification_topics_real = pick($cinder::ceilometer::notification_topics,
-                                    $notification_topics)
-
   oslo::messaging::notifications { 'cinder_config':
-    transport_url => $notification_transport_url_real,
-    driver        => $notification_driver_real,
-    topics        => $notification_topics_real,
+    transport_url => $notification_transport_url,
+    driver        => $notification_driver,
+    topics        => $notification_topics,
   }
 
   if ! $default_availability_zone {
diff --git a/releasenotes/notes/remove-cinder-ceilometer-8b670329334c4b10.yaml b/releasenotes/notes/remove-cinder-ceilometer-8b670329334c4b10.yaml
new file mode 100644
index 00000000..66e2cfa1
--- /dev/null
+++ b/releasenotes/notes/remove-cinder-ceilometer-8b670329334c4b10.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The cinder::ceilometer class is removed, set the parameters in the cinder
+    class directly instead.