From 6c4650f815564029fb6c631257ae9b47d40106bc Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 26 Apr 2020 22:01:11 +0900
Subject: [PATCH] Remove heat::engine::heat_watch_server_url

... because it was deprecated a while ago[1].

[1] ae564bbd7c1f94c95c7a0ddbda26219d4f2f8a13

Change-Id: I7fd241112c8bd5ee5cd9edaa6669b162ffbf190c
---
 manifests/engine.pp                                  | 12 ------------
 ..._watch_server_url-parameter-66d5ffd9feabd01e.yaml |  4 ++++
 2 files changed, 4 insertions(+), 12 deletions(-)
 create mode 100644 releasenotes/notes/remove-heat_watch_server_url-parameter-66d5ffd9feabd01e.yaml

diff --git a/manifests/engine.pp b/manifests/engine.pp
index 08f38c12..4789c10f 100644
--- a/manifests/engine.pp
+++ b/manifests/engine.pp
@@ -134,12 +134,6 @@
 #   by user-controlled servers to make calls back to Heat.
 #   Defaults to $::os_service_default
 #
-# DEPRECATED PARAMETERS
-#
-# [*heat_watch_server_url*]
-#   (optional) URL of the Heat cloudwatch server
-#   Defaults to undef.
-#
 class heat::engine (
   $auth_encryption_key,
   $package_ensure                                  = 'present',
@@ -166,16 +160,10 @@ class heat::engine (
   $plugin_dirs                                     = $::os_service_default,
   $client_retry_limit                              = $::os_service_default,
   $server_keystone_endpoint_type                   = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $heat_watch_server_url                           = undef,
 ) {
 
   include heat::deps
 
-  if $heat_watch_server_url {
-    warning('heat_watch_server_url has no effect and will be removed in a future release.')
-  }
-
   # Validate Heat Engine AES key
   # must be either 16, 24, or 32 bytes long
   # https://bugs.launchpad.net/heat/+bug/1415887
diff --git a/releasenotes/notes/remove-heat_watch_server_url-parameter-66d5ffd9feabd01e.yaml b/releasenotes/notes/remove-heat_watch_server_url-parameter-66d5ffd9feabd01e.yaml
new file mode 100644
index 00000000..122306af
--- /dev/null
+++ b/releasenotes/notes/remove-heat_watch_server_url-parameter-66d5ffd9feabd01e.yaml
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - |
+    The heat::engine::heat_watch_server_url parameter has been removed.