From eef0bbcaa3a2d7a00d078a190eada9fda75dfa19 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 29 Jul 2020 09:52:31 +0900
Subject: [PATCH] Remove deprecated parameters for failure notifications

Change-Id: I9af36bd45f19ad61e9725aaf10deb70cebfe8806
---
 manifests/init.pp                             | 20 -------------------
 ...failure-notification-8525eb14964260fd.yaml |  7 +++++++
 2 files changed, 7 insertions(+), 20 deletions(-)
 create mode 100644 releasenotes/notes/remove-deprecated-opts-for-failure-notification-8525eb14964260fd.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 4a5063ab9..5afc6e843 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -397,19 +397,9 @@
 #
 # DEPRECATED PARAMETERS
 #
-# [*notify_api_faults*]
-#   (optional) If set, send api.fault notifications on caught
-#   exceptions in the API service
-#   Defaults to undef
-#
 # [*image_service*]
 #   (optional) Service used to search for and retrieve images.
 #
-# [*notify_on_api_faults*]
-#   (optional) If set, send api.fault notifications on caught
-#   exceptions in the API service
-#   Defaults to undef
-#
 # [*auth_strategy*]
 #   (optional) The strategy to use for auth: noauth or keystone.
 #   Defaults to undef
@@ -526,9 +516,7 @@ class nova(
   $my_ip                                  = $::os_service_default,
   $cross_az_attach                        = $::os_service_default,
   # DEPRECATED PARAMETERS
-  $notify_api_faults                      = undef,
   $image_service                          = undef,
-  $notify_on_api_faults                   = undef,
   $auth_strategy                          = undef,
   $glance_api_servers                     = undef,
   $database_min_pool_size                 = undef,
@@ -547,14 +535,6 @@ class nova(
       warning('enabled_ssl_apis is empty but use_ssl is set to true')
   }
 
-  if $notify_api_faults {
-    warning('The notify_api_faults parameter is deprecated.')
-  }
-
-  if $notify_on_api_faults {
-    warning('The notify_on_api_faults parameter is deprecated.')
-  }
-
   if $os_region_name != undef {
     warning('The os_region_name parameter is deprecated and will be removed \
 in a future release. Use nova::cinder::os_region_name instead')
diff --git a/releasenotes/notes/remove-deprecated-opts-for-failure-notification-8525eb14964260fd.yaml b/releasenotes/notes/remove-deprecated-opts-for-failure-notification-8525eb14964260fd.yaml
new file mode 100644
index 000000000..4403fa922
--- /dev/null
+++ b/releasenotes/notes/remove-deprecated-opts-for-failure-notification-8525eb14964260fd.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    The following parameters have been removed.
+
+    - ``nova::notify_api_faults``
+    - ``nova::notify_on_api_faults``