From 2bbb88eeee681b406b406241f25814db5334e8e0 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Tue, 2 Jan 2024 17:54:03 +0900
Subject: [PATCH] Remove deprecated rgw_service

... which was deprecated in 5.0.0 [1].

[1] f5c1cf3ad5760d55cdefe38011ae7785d3c054fa

Related-Bug: #2029009
Change-Id: I1d75dce1f4a74c19210f9e5de673d76bdfecd1e5
---
 manifests/rgw/keystone/auth.pp                | 19 ++-----------------
 .../remove-rgw_service-f3aeaf594927d081.yaml  |  4 ++++
 2 files changed, 6 insertions(+), 17 deletions(-)
 create mode 100644 releasenotes/notes/remove-rgw_service-f3aeaf594927d081.yaml

diff --git a/manifests/rgw/keystone/auth.pp b/manifests/rgw/keystone/auth.pp
index f8118bd1..4ba61842 100644
--- a/manifests/rgw/keystone/auth.pp
+++ b/manifests/rgw/keystone/auth.pp
@@ -49,12 +49,6 @@
 #   (Optional) Type of service.
 #   Defaults to 'object-store'.
 #
-# DEPRECATED PARAMETERS
-#
-# [*rgw_service*]
-#   Name of the keystone service used by RGW
-#   Defaults to undef
-#
 class ceph::rgw::keystone::auth (
   $password,
   $user,
@@ -68,25 +62,16 @@ class ceph::rgw::keystone::auth (
   $service_description = 'Ceph RGW Service',
   $service_name        = 'swift',
   $service_type        = 'object-store',
-  # DEPRECATED PARAMETERS
-  $rgw_service         = undef,
 ) {
 
   include openstacklib::openstackclient
 
-  if $rgw_service {
-    warning('The rgw_service parameter is deprecated')
-    $rgw_service_real = $rgw_service
-  } else {
-    $rgw_service_real = "${service_name}::${service_type}"
-  }
-
-  ensure_resource('keystone_service', $rgw_service_real, {
+  ensure_resource('keystone_service', "${service_name}::${service_type}", {
     'ensure'      => 'present',
     'description' => $service_description,
   } )
 
-  ensure_resource('keystone_endpoint', "${region}/${rgw_service_real}", {
+  ensure_resource('keystone_endpoint', "${region}/${service_name}::${service_type}", {
     'ensure'       => 'present',
     'public_url'   => $public_url,
     'admin_url'    => $admin_url,
diff --git a/releasenotes/notes/remove-rgw_service-f3aeaf594927d081.yaml b/releasenotes/notes/remove-rgw_service-f3aeaf594927d081.yaml
new file mode 100644
index 00000000..039230e5
--- /dev/null
+++ b/releasenotes/notes/remove-rgw_service-f3aeaf594927d081.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``ceph::rgw::keystone::auth::rgw_service`` parameter has been removed.