From d116eb73c98fb7ba76110d7c5bb5f5768e93f259 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Thu, 24 May 2018 11:17:38 +0800
Subject: [PATCH] Remove deprecated heat_service_type param

Remove the deprecated heat_service_type param which has been deprecated.

Change-Id: I22a1605a1ac583eb1d30e984ac24c02c4d92662b
---
 manifests/init.pp                                        | 9 ---------
 ...ve_deprecated_heat_service_type-8f7a2256681b5ed0.yaml | 4 ++++
 2 files changed, 4 insertions(+), 9 deletions(-)
 create mode 100644 releasenotes/notes/remove_deprecated_heat_service_type-8f7a2256681b5ed0.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 41d0def4..b512f817 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -322,10 +322,6 @@
 #     amqp (for AMQP 1.0)
 #   Defaults to 'rabbit'
 #
-# [*heat_service_type*]
-#   (optional) Heat service type to use when searching catalog.
-#   Defaults to undef.
-#
 class trove(
   $nova_proxy_admin_pass,
   $default_transport_url        = $::os_service_default,
@@ -397,7 +393,6 @@ class trove(
   $rabbit_userid                = $::os_service_default,
   $rabbit_virtual_host          = $::os_service_default,
   $rpc_backend                  = 'rabbit',
-  $heat_service_type            = undef,
 ) {
 
   include ::trove::deps
@@ -417,10 +412,6 @@ trove::rpc_backend are deprecated. Please use trove::default_transport_url \
 instead.")
   }
 
-  if $heat_service_type {
-    warning('The heat_service_type parameter is deprecated, has no effect and will be removed in R release')
-  }
-
   if $nova_compute_url {
     trove_config { 'DEFAULT/nova_compute_url': value => $nova_compute_url }
   }
diff --git a/releasenotes/notes/remove_deprecated_heat_service_type-8f7a2256681b5ed0.yaml b/releasenotes/notes/remove_deprecated_heat_service_type-8f7a2256681b5ed0.yaml
new file mode 100644
index 00000000..83a5a7a1
--- /dev/null
+++ b/releasenotes/notes/remove_deprecated_heat_service_type-8f7a2256681b5ed0.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The deprecated trove::heat_service_type is now removed.