From 2fd8cd69ab76a845aea92a7929d5464b9fabffc7 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 21 Sep 2021 17:33:06 +0900
Subject: [PATCH] Remove parameters for keystone endpoint/service

... because these parameters were deprecated during the wallaby
cycle[1], and has been ineffective since then.

[1] be7a359ad661aa5a3950974e25adf9aa343ee369

Change-Id: I1a5fc6eb74d6decf8bbec0eabf688cb7da921c3d
---
 manifests/keystone/auth.pp                    | 62 -------------------
 ...tone-endpoint-params-2940d362989e4284.yaml | 13 ++++
 2 files changed, 13 insertions(+), 62 deletions(-)
 create mode 100644 releasenotes/notes/remove-keystone-endpoint-params-2940d362989e4284.yaml

diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 571256fb..c8cb0c8f 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -31,43 +31,6 @@
 #   (Optional) Tenant for Ceilometer user.
 #   Defaults to 'services'.
 #
-# DEPRECATED PARAMETERS
-#
-# [*service_name*]
-#   (Optional) Name of the service.
-#   Defaults to undef
-#
-# [*service_type*]
-#   (Optional) Type of service. Optional.
-#   Defaults to undef
-#
-# [*service_description*]
-#   (Optional) Description for keystone service.
-#   Defaults to undef
-#
-# [*configure_endpoint*]
-#   (Optional) Should Ceilometer endpoint be configured.
-#   Defaults to undef
-#
-# [*configure_service*]
-#   (Optional) Whether to create the service.
-#   Default to undef
-#
-# [*public_url*]
-#   (Optional) The endpoint's public url.
-#   This url should *not* contain any trailing '/'.
-#   Defaults to undef
-#
-# [*admin_url*]
-#   (Optional) The endpoint's admin url.
-#   This url should *not* contain any trailing '/'.
-#   Defaults to undef
-#
-# [*internal_url*]
-#   (Optional) The endpoint's internal url.
-#   This url should *not* contain any trailing '/'.
-#   Defaults to undef
-#
 # === Examples:
 #
 #  class { 'ceilometer::keystone::auth':
@@ -82,37 +45,12 @@ class ceilometer::keystone::auth (
   $configure_user_role  = true,
   $region               = 'RegionOne',
   $tenant               = 'services',
-  # DEPRECATED PARAMETERS
-  $service_name         = undef,
-  $service_type         = undef,
-  $service_description  = undef,
-  Optional[Boolean] $configure_service = undef,
-  $configure_endpoint   = undef,
-  $public_url           = undef,
-  $admin_url            = undef,
-  $internal_url         = undef,
 ) {
 
   include ceilometer::deps
 
   validate_legacy(String, 'validate_string', $password)
 
-  if $service_name != undef or $service_type != undef or $service_description != undef {
-    warning('The parameters for keystone service record have been deprecated and have no effect')
-  }
-
-  if $configure_endpoint != undef {
-    warning('The configure_endpoint parameter has been deprecated and has no effect')
-  }
-
-  if $configure_service != undef {
-    warning('The configure_service parameter has been deprecated and has no effect')
-  }
-
-  if $public_url != undef or $admin_url != undef or $internal_url != undef {
-    warning('The parameters for keystone endpoint record have been deprecated and have no effect')
-  }
-
   # Ceilometer rquires only its user, project, and role assignment.
   # service and endpoint should be disabled since ceilometer-api has been removed.
   keystone::resource::service_identity { 'ceilometer':
diff --git a/releasenotes/notes/remove-keystone-endpoint-params-2940d362989e4284.yaml b/releasenotes/notes/remove-keystone-endpoint-params-2940d362989e4284.yaml
new file mode 100644
index 00000000..5eee1d83
--- /dev/null
+++ b/releasenotes/notes/remove-keystone-endpoint-params-2940d362989e4284.yaml
@@ -0,0 +1,13 @@
+---
+upgrade:
+  - |
+    The following parameters have been removed.
+
+    - ``ceilometer::keystone::auth::service_name``
+    - ``ceilometer::keystone::auth::service_type``
+    - ``ceilometer::keystone::auth::service_description``
+    - ``ceilometer::keystone::auth::configure_endpoint``
+    - ``ceilometer::keystone::auth::configure_service``
+    - ``ceilometer::keystone::auth::public_url``
+    - ``ceilometer::keystone::auth::admin_url``
+    - ``ceilometer::keystone::auth::internal_url``