From e19a4c31510fb751cecf36bc74ced5047de803b2 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 15 Nov 2022 11:39:41 +0900
Subject: [PATCH] Remove deprecated keystone::log_* parameters

These parmaeters have had no effect for a while and were deprecated
formally during the previous cycle[1].

[1] 1f13f9ed6b26b2d408371c31c41a1b82d9a6ab6b

Change-Id: Iff34bd86a92d4f92ea46115889f83e37b68aba31
---
 manifests/init.pp                             | 19 -------------------
 ...move-base-log-params-f3d1724b60c3fa74.yaml |  5 +++++
 2 files changed, 5 insertions(+), 19 deletions(-)
 create mode 100644 releasenotes/notes/remove-base-log-params-f3d1724b60c3fa74.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 12c5df357..b4a5b1646 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -325,15 +325,6 @@
 #   This accepts sql or template.
 #   Defaults to undef.
 #
-# [*log_dir*]
-#   (Optional) Directory where logs should be stored
-#   If set to $::os_service_default, it will not log to any directory
-#   Defaults to undef.
-#
-# [*log_file*]
-#   (Optional) Where to log
-#   Defaults to undef.
-#
 # [*enable_ssl*]
 #   (Optional) Toggle for SSL support on the keystone eventlet servers.
 #   (boolean value)
@@ -426,8 +417,6 @@ class keystone(
   $amqp_durable_queues                  = $::os_service_default,
   # DEPRECATED PARAMETERS
   $catalog_type                         = undef,
-  $log_dir                              = undef,
-  $log_file                             = undef,
   $enable_ssl                           = undef,
   $ssl_certfile                         = undef,
   $ssl_keyfile                          = undef,
@@ -474,14 +463,6 @@ class keystone(
   include keystone::db
   include keystone::params
 
-  if $log_dir != undef {
-    warning('The keystone::log_dir parameter is deprecated and has no effect.')
-  }
-
-  if $log_file != undef {
-    warning('The keystone::log_file parameter is deprecated and has no effect.')
-  }
-
   package { 'keystone':
     ensure => $package_ensure,
     name   => $::keystone::params::package_name,
diff --git a/releasenotes/notes/remove-base-log-params-f3d1724b60c3fa74.yaml b/releasenotes/notes/remove-base-log-params-f3d1724b60c3fa74.yaml
new file mode 100644
index 000000000..913906580
--- /dev/null
+++ b/releasenotes/notes/remove-base-log-params-f3d1724b60c3fa74.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``keystone::log_dir`` parameter and the ``keystone::log_file``
+    parameter have been removed.