From 21f2e8e48fbe19ea2c0c1e8fee8afe958b21525a Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 3 May 2022 16:58:03 +0900
Subject: [PATCH] Remove cinder::api::os_region_name

... because this parameter has had no effect since Rocky and was
formally deprecated during Ussuri cycle[1].

[1] c2d618cae70ba1be7dd8496ce7665ac3abaf8775

Change-Id: I680ae64da23ff4364288f52fe55b9cc4b7735cee
---
 manifests/api.pp                                     | 12 ------------
 ...e-cinder-api-os_region_name-c9c8b474d380c31f.yaml |  4 ++++
 2 files changed, 4 insertions(+), 12 deletions(-)
 create mode 100644 releasenotes/notes/remove-cinder-api-os_region_name-c9c8b474d380c31f.yaml

diff --git a/manifests/api.pp b/manifests/api.pp
index 3d371ab2..d79f8a74 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -107,12 +107,6 @@
 #
 # DEPRECATED PARAMETERS
 #
-# [*os_region_name*]
-#   (optional) Some operations require cinder to make API requests
-#   to Nova. This sets the keystone region to be used for these
-#   requests. For example, boot-from-volume.
-#   Defaults to undef
-#
 # [*validate*]
 #   (optional) Whether to validate the service is working after any service
 #   refreshes
@@ -143,7 +137,6 @@ class cinder::api (
   $osapi_volume_listen_port       = $::os_service_default,
   $use_forwarded_for              = $::os_service_default,
   # DEPRECATED PARAMETERS
-  $os_region_name                 = undef,
   $validate                       = undef,
 ) inherits cinder::params {
 
@@ -151,11 +144,6 @@ class cinder::api (
   include cinder::params
   include cinder::policy
 
-  if $os_region_name != undef {
-    warning('cinder::api::os_region_name is deprecated and has no effect. \
-Use cinder::nova::region_name instead')
-  }
-
   if $validate != undef {
     warning('The cinder::api::validate parameter is deprecated and has no effect')
   }
diff --git a/releasenotes/notes/remove-cinder-api-os_region_name-c9c8b474d380c31f.yaml b/releasenotes/notes/remove-cinder-api-os_region_name-c9c8b474d380c31f.yaml
new file mode 100644
index 00000000..f147578e
--- /dev/null
+++ b/releasenotes/notes/remove-cinder-api-os_region_name-c9c8b474d380c31f.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``cinder::api::os_region_name`` parameter has been removed.