From 0cec98ddab59328794b2a18a239fa725e624b5e1 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Wed, 7 Feb 2018 14:52:57 +0800
Subject: [PATCH] Remove deprecated backup_topic option

Change-Id: I78259f20079bb1c69c16fca2bde5750cd2cae08b
---
 manifests/backup.pp                                  | 12 ------------
 ...ove_deprecated_backup_topic-87135ef21d091345.yaml |  3 +++
 2 files changed, 3 insertions(+), 12 deletions(-)
 create mode 100644 releasenotes/notes/remove_deprecated_backup_topic-87135ef21d091345.yaml

diff --git a/manifests/backup.pp b/manifests/backup.pp
index 516667cd..e8a91895 100644
--- a/manifests/backup.pp
+++ b/manifests/backup.pp
@@ -28,12 +28,6 @@
 #   (optional) Template string to be used to generate backup names.
 #   Defaults to $::os_service_default
 #
-# DEPRECATED PARAMETERS
-#
-# [*backup_topic*]
-#   (optional) The topic volume backup nodes listen on.
-#   Defaults to undef
-#
 # === Author(s)
 #
 # Emilien Macchi <emilien.macchi@enovance.com>
@@ -61,8 +55,6 @@ class cinder::backup (
   $backup_manager       = $::os_service_default,
   $backup_api_class     = $::os_service_default,
   $backup_name_template = $::os_service_default,
-  #DEPRECATED PARAMETERS
-  $backup_topic         = undef,
 ) {
 
   include ::cinder::deps
@@ -95,10 +87,6 @@ class cinder::backup (
     tag       => 'cinder-service',
   }
 
-  if $backup_topic {
-    warning('The backup_topic parameter is deprecated, has no effect and will be removed in future release.')
-  }
-
   cinder_config {
     'DEFAULT/backup_manager':       value => $backup_manager;
     'DEFAULT/backup_api_class':     value => $backup_api_class;
diff --git a/releasenotes/notes/remove_deprecated_backup_topic-87135ef21d091345.yaml b/releasenotes/notes/remove_deprecated_backup_topic-87135ef21d091345.yaml
new file mode 100644
index 00000000..27e1ffc8
--- /dev/null
+++ b/releasenotes/notes/remove_deprecated_backup_topic-87135ef21d091345.yaml
@@ -0,0 +1,3 @@
+---
+other:
+  - Remove deprecated cinder::backup::backup_topic option.