From 0fd586f63c5ecc493a1ebf84840ccff9dfb87412 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 9 May 2022 08:26:56 +0900
Subject: [PATCH] Remove member_role_id/name

These parameters were deprecated during Yoga cycle[1] and have had no
effect since then.

[1] f4bba7122a4d3010be3905b4314071a71307f1f1

Change-Id: I0e212c99a2295b447286056355237212920e5ee2
---
 manifests/init.pp                             | 28 -------------------
 .../remove-member_role-1e0ebbdf80881de6.yaml  |  5 ++++
 2 files changed, 5 insertions(+), 28 deletions(-)
 create mode 100644 releasenotes/notes/remove-member_role-1e0ebbdf80881de6.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index f7f6957a1..8ac45e966 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -314,18 +314,6 @@
 #
 # DEPRECATED PARAMETERS
 #
-# [*member_role_id*]
-#   (Optional) Similar to the member_role_name option, this represents the
-#   default role ID used to associate users with their default projects in the
-#   v2 API. This will be used as the explicit role where one is not specified
-#   by the v2 API.
-#   Defaults to undef
-#
-# [*member_role_name*]
-#   (Optional) # This is the role name used in combination with the
-#   member_role_id option; see that option for more detail.
-#   Defaults to undef
-#
 # [*admin_endpoint*]
 #   (Optional) The base admin endpoint URL for keystone that are
 #   advertised to clients (NOTE: this does NOT affect how keystone listens
@@ -438,8 +426,6 @@ class keystone(
   $purge_config                         = false,
   $amqp_durable_queues                  = $::os_service_default,
   # DEPRECATED PARAMETERS
-  $member_role_id                       = undef,
-  $member_role_name                     = undef,
   $admin_endpoint                       = undef,
   $catalog_type                         = undef,
   $log_dir                              = undef,
@@ -491,14 +477,6 @@ class keystone(
   include keystone::db
   include keystone::params
 
-  if $member_role_id != undef {
-    warning('The keystone::member_role_id parameter is deprecated and has no effect')
-  }
-
-  if $member_role_name != undef {
-    warning('The keystone::member_role_name parameter is deprecated and has no effect')
-  }
-
   if $log_dir != undef {
     warning('The keystone::log_dir parameter is deprecated and has no effect.')
   }
@@ -507,12 +485,6 @@ class keystone(
     warning('The keystone::log_file parameter is deprecated and has no effect.')
   }
 
-  # TODO(tkajinam): Remove this when removing member_role_* parameters
-  keystone_config {
-    'DEFAULT/member_role_id':   ensure => absent;
-    'DEFAULT/member_role_name': ensure => absent;
-  }
-
   if $admin_endpoint != undef {
     warning('The keystone::admin_endpoint parameter is deprecated. This parameter has no effect')
   }
diff --git a/releasenotes/notes/remove-member_role-1e0ebbdf80881de6.yaml b/releasenotes/notes/remove-member_role-1e0ebbdf80881de6.yaml
new file mode 100644
index 000000000..e94284245
--- /dev/null
+++ b/releasenotes/notes/remove-member_role-1e0ebbdf80881de6.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``member_role_id`` parameter and the ``member_role_name`` parameter
+    of the ``keystone`` class have been removed.