From 0be13a60829558a14c9570cace8e5d2152979ce7 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Thu, 24 May 2018 11:03:35 +0800
Subject: [PATCH] Remove deprecated rpc_backend param

Remove the deprecated rpc_backend param which has been deprecated for
two years. The default_transport_url has been present for a while
now and should be used.

Change-Id: Iecc7b1a1d3f01b8b2f6435f850240ec06992f3cb
---
 manifests/init.pp                                 | 15 ---------------
 ...deprecated-rabbit-params-975b0c89b2ef85fc.yaml |  5 +++++
 2 files changed, 5 insertions(+), 15 deletions(-)
 create mode 100644 releasenotes/notes/remove-deprecated-rabbit-params-975b0c89b2ef85fc.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 6e5082a5..e402d558 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -174,15 +174,6 @@
 #   in the octavia config.
 #   Defaults to false.
 #
-# DEPRECATED PARAMETERS
-#
-# [*rpc_backend*]
-#   (optional) The rpc backend implementation to use, can be:
-#     amqp (for AMQP 1.0 protocol)
-#     rabbit (for rabbitmq)
-#     zmq (for zeromq)
-#   Defaults to 'rabbit'
-#
 class octavia (
   $package_ensure                     = 'present',
   $default_transport_url              = $::os_service_default,
@@ -221,17 +212,11 @@ class octavia (
   $notification_topics                = $::os_service_default,
   $topic                              = 'octavia-rpc',
   $purge_config                       = false,
-  # DEPRECATED PARAMETERS
-  $rpc_backend                        = 'rabbit',
 ) inherits octavia::params {
 
   include ::octavia::deps
   include ::octavia::logging
 
-  if $rpc_backend {
-    warning('The rpc_backend parameter has been deprecated, please use default_transport_url instead.')
-  }
-
   package { 'octavia':
     ensure => $package_ensure,
     name   => $::octavia::params::common_package_name,
diff --git a/releasenotes/notes/remove-deprecated-rabbit-params-975b0c89b2ef85fc.yaml b/releasenotes/notes/remove-deprecated-rabbit-params-975b0c89b2ef85fc.yaml
new file mode 100644
index 00000000..0482eef0
--- /dev/null
+++ b/releasenotes/notes/remove-deprecated-rabbit-params-975b0c89b2ef85fc.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The deprecated octavia::rpc_backend is now removed. Please use
+    octavia::default_transport_url instead.