From ff956c7a5b9c848a99954e8b877bfa94bcd28e34 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 19 Jun 2022 22:04:51 +0900
Subject: [PATCH] Remove deprecated parameters for websocket service user

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

[1] 7eeb46e04d61189925dbbaa06d3016a0235d6200

Change-Id: I6b2ee2e3e9fb633f5f3c6fa9b2e4106e5430484e
---
 manifests/keystone/auth_websocket.pp          | 60 +++----------------
 ...eanup-websocket-auth-8e0fb1386f597483.yaml | 12 ++++
 2 files changed, 21 insertions(+), 51 deletions(-)
 create mode 100644 releasenotes/notes/cleanup-websocket-auth-8e0fb1386f597483.yaml

diff --git a/manifests/keystone/auth_websocket.pp b/manifests/keystone/auth_websocket.pp
index 7e2d87c..9c1ed79 100644
--- a/manifests/keystone/auth_websocket.pp
+++ b/manifests/keystone/auth_websocket.pp
@@ -40,62 +40,20 @@
 #   (Optional) Description for keystone service.
 #   Defaults to 'OpenStack Messaging Websocket Service'.
 #
-# DEPRECATED PARAMETERS
-#
-# [*password*]
-#   (Optional) Password for zaqar websocket user. Defaults to undef.
-#
-# [*auth_name*]
-#   (Optional) Username for zaqar service. Defaults to undef.
-#
-# [*email*]
-#   (Optional) Email for zaqar websocket user. Defaults to undef.
-#
-# [*tenant*]
-#   (Optional) Tenant for zaqar websocket user. Defaults to undef.
-#
-# [*configure_user*]
-#   (Optional) Should the service user be configured?
-#   Defaults to undef
-#
-# [*configure_user_role*]
-#   (Optional) Whether to configure the admin role for the service user.
-#   Defaults to undef
-#
 class zaqar::keystone::auth_websocket(
-  $service_name           = 'zaqar-websocket',
-  $service_type           = 'messaging-websocket',
-  $public_url             = 'ws://127.0.0.1:9000',
-  $admin_url              = 'ws://127.0.0.1:9000',
-  $internal_url           = 'ws://127.0.0.1:9000',
-  $region                 = 'RegionOne',
-  $configure_endpoint     = true,
-  $configure_service      = true,
-  $service_description    = 'OpenStack Messaging Websocket Service',
-  # DEPRECATED PARAMETERS
-  $auth_name              = undef,
-  $password               = undef,
-  $email                  = undef,
-  $tenant                 = undef,
-  $configure_user         = undef,
-  $configure_user_role    = undef,
+  $service_name        = 'zaqar-websocket',
+  $service_type        = 'messaging-websocket',
+  $public_url          = 'ws://127.0.0.1:9000',
+  $admin_url           = 'ws://127.0.0.1:9000',
+  $internal_url        = 'ws://127.0.0.1:9000',
+  $region              = 'RegionOne',
+  $configure_endpoint  = true,
+  $configure_service   = true,
+  $service_description = 'OpenStack Messaging Websocket Service',
 ) {
 
   include zaqar::deps
 
-  [
-    'auth_name',
-    'password',
-    'email',
-    'tenant',
-    'configure_user',
-    'configure_user_role'
-  ].each |String $param| {
-    if getvar($param) != undef {
-      warning("The zaqar::keystone::auth_websocket::${param} parameter is deprecated and has no effect")
-    }
-  }
-
   Keystone::Resource::Service_identity['zaqar-websocket'] -> Anchor['zaqar::service::end']
 
   keystone::resource::service_identity { 'zaqar-websocket':
diff --git a/releasenotes/notes/cleanup-websocket-auth-8e0fb1386f597483.yaml b/releasenotes/notes/cleanup-websocket-auth-8e0fb1386f597483.yaml
new file mode 100644
index 0000000..651b1a4
--- /dev/null
+++ b/releasenotes/notes/cleanup-websocket-auth-8e0fb1386f597483.yaml
@@ -0,0 +1,12 @@
+---
+upgrade:
+  - |
+    The following parameters of the ``zaqar::keystone::auth_websocket`` class
+    have been removed.
+
+    - ``configure_user``
+    - ``configure_user_role``
+    - ``auth_name``
+    - ``password``
+    - ``email``
+    - ``tenant``