From a4c6ca209411efb94e077d3b61008d8124c43bcb Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Wed, 16 Apr 2025 20:55:30 +0900
Subject: [PATCH] Remove watch_log_file

The option was deprecated during the 2024.2 cycle[1]. Processes may
fail to start when it is set to True[2] so supporting it is no longer
useful.

[1] 31603ac6dacd0b47ec9f02d99bfdd0a7b683119c
[2] b977cb9becbeaaa67bb663bd8db5aa6846e495b9

Change-Id: I80c9aaffc51ee467b017396b5e5452b6daddb45d
---
 manifests/logging.pp                                     | 9 ---------
 .../notes/remove-watch_log_file-3f4a2dc994a7e6b3.yaml    | 4 ++++
 spec/classes/manila_logging_spec.rb                      | 2 --
 3 files changed, 4 insertions(+), 11 deletions(-)
 create mode 100644 releasenotes/notes/remove-watch_log_file-3f4a2dc994a7e6b3.yaml

diff --git a/manifests/logging.pp b/manifests/logging.pp
index 96450c1c..b8e90122 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -97,12 +97,6 @@
 #   Defaults to $facts['os_service_default']
 #   Example: 'Y-%m-%d %H:%M:%S'
 #
-# DEPRECATED PARAMETERS
-#
-# [*watch_log_file*]
-#   (Optional) Uses logging handler designed to watch file system (boolean value).
-#   Defaults to undef
-#
 class manila::logging(
   $use_syslog                    = $facts['os_service_default'],
   $use_json                      = $facts['os_service_default'],
@@ -123,8 +117,6 @@ class manila::logging(
   $instance_format               = $facts['os_service_default'],
   $instance_uuid_format          = $facts['os_service_default'],
   $log_date_format               = $facts['os_service_default'],
-  # DEPRECATED PARAMETERS
-  $watch_log_file                = undef,
 ) {
 
   include manila::deps
@@ -137,7 +129,6 @@ class manila::logging(
     use_stderr                    => $use_stderr,
     log_dir                       => $log_dir,
     log_file                      => $log_file,
-    watch_log_file                => $watch_log_file,
     syslog_log_facility           => $log_facility,
     logging_context_format_string => $logging_context_format_string,
     logging_default_format_string => $logging_default_format_string,
diff --git a/releasenotes/notes/remove-watch_log_file-3f4a2dc994a7e6b3.yaml b/releasenotes/notes/remove-watch_log_file-3f4a2dc994a7e6b3.yaml
new file mode 100644
index 00000000..2970c0cf
--- /dev/null
+++ b/releasenotes/notes/remove-watch_log_file-3f4a2dc994a7e6b3.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``manila::logging::watch_log_file`` parameter has been removed.
diff --git a/spec/classes/manila_logging_spec.rb b/spec/classes/manila_logging_spec.rb
index 83421e98..7b05059b 100644
--- a/spec/classes/manila_logging_spec.rb
+++ b/spec/classes/manila_logging_spec.rb
@@ -30,7 +30,6 @@ describe 'manila::logging' do
      :log_facility                   => 'LOG_FOO',
      :log_dir                        => '/var/log',
      :log_file                       => '/var/log/manila/manila.log',
-     :watch_log_file                 => true,
      :debug                          => true,
     }
   end
@@ -82,7 +81,6 @@ describe 'manila::logging' do
         :syslog_log_facility => 'LOG_FOO',
         :log_dir             => '/var/log',
         :log_file            => '/var/log/manila/manila.log',
-        :watch_log_file      => true,
         :debug               => true,
       )
     end