From a6380e618666c1d1b0d05a82c6c00e2a7da19483 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 9 May 2022 08:29:14 +0900
Subject: [PATCH] Clean up admin_endpoint

The parameter has been unused and was formally deprecated during Yoga
cycle[1].

[1] aeb2861b46a7a4c28e134309e9212f393f310dfd

Change-Id: I20d6b10c254241f61ac560d703a885a30cf6e4c4
---
 manifests/init.pp                                   | 13 -------------
 .../remove-admin_endpoint-00973a0b88f4e611.yaml     |  4 ++++
 2 files changed, 4 insertions(+), 13 deletions(-)
 create mode 100644 releasenotes/notes/remove-admin_endpoint-00973a0b88f4e611.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 8ac45e966..142b66bb5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -314,14 +314,6 @@
 #
 # DEPRECATED PARAMETERS
 #
-# [*admin_endpoint*]
-#   (Optional) The base admin endpoint URL for keystone that are
-#   advertised to clients (NOTE: this does NOT affect how keystone listens
-#   for connections) (string value)
-#   If set to false, no admin_endpoint will be defined in keystone.conf.
-#   Sample value: 'http://localhost:5000/'
-#   Defaults to undef
-#
 # [*catalog_type*]
 #   (Optional) Type of catalog that keystone uses to store endpoints, services.
 #   This accepts sql or template.
@@ -426,7 +418,6 @@ class keystone(
   $purge_config                         = false,
   $amqp_durable_queues                  = $::os_service_default,
   # DEPRECATED PARAMETERS
-  $admin_endpoint                       = undef,
   $catalog_type                         = undef,
   $log_dir                              = undef,
   $log_file                             = undef,
@@ -485,10 +476,6 @@ class keystone(
     warning('The keystone::log_file parameter is deprecated and has no effect.')
   }
 
-  if $admin_endpoint != undef {
-    warning('The keystone::admin_endpoint parameter is deprecated. This parameter has no effect')
-  }
-
   package { 'keystone':
     ensure => $package_ensure,
     name   => $::keystone::params::package_name,
diff --git a/releasenotes/notes/remove-admin_endpoint-00973a0b88f4e611.yaml b/releasenotes/notes/remove-admin_endpoint-00973a0b88f4e611.yaml
new file mode 100644
index 000000000..1457b0e7d
--- /dev/null
+++ b/releasenotes/notes/remove-admin_endpoint-00973a0b88f4e611.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``keystone::admin_endpoint`` parameter has been removed.