From 036b11b917d15e3f8905dba0c065d0acf1dc381b Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: 2025年4月17日 20:38:45 +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: I03d9e5b6090793d200d3c9c3f2682d7abf6143df --- manifests/log.pp | 17 ----------------- .../remove-watch_log_file-0949dfc2300af8e4.yaml | 4 ++++ spec/defines/oslo_log_spec.rb | 3 --- 3 files changed, 4 insertions(+), 20 deletions(-) create mode 100644 releasenotes/notes/remove-watch_log_file-0949dfc2300af8e4.yaml diff --git a/manifests/log.pp b/manifests/log.pp index 3f7f4e1..af22715 100644 --- a/manifests/log.pp +++ b/manifests/log.pp @@ -106,12 +106,6 @@ # (Optional) Enables or disables fatal status of deprecations (boolean value). # Defaults to $facts['os_service_default'] # -# DEPRECATED PARAMETERS -# -# [*watch_log_file*] -# (Optional) Uses logging handler designed to watch file system (boolean value). -# Defaults to undef -# define oslo::log( $debug = $facts['os_service_default'], $log_config_append = $facts['os_service_default'], @@ -133,18 +127,8 @@ define oslo::log( $instance_format = $facts['os_service_default'], $instance_uuid_format = $facts['os_service_default'], $fatal_deprecations = $facts['os_service_default'], - # DEPRECATED PARMETERS - $watch_log_file = undef, ){ - if $watch_log_file != undef { - warning("The watch_log_file parameter has been deprecated \ -and will be removed in a future release.") - $watch_log_file_real = $watch_log_file - } else { - $watch_log_file_real = $facts['os_service_default'] - } - $default_log_levels_real = $default_log_levels ? { Hash => join(sort(join_keys_to_values($default_log_levels, '=')), ','), Array => join(sort($default_log_levels), ','), @@ -165,7 +149,6 @@ and will be removed in a future release.") 'DEFAULT/log_date_format' => { value => $log_date_format }, 'DEFAULT/log_file' => { value => $log_file }, 'DEFAULT/log_dir' => { value => $log_dir }, - 'DEFAULT/watch_log_file' => { value => $watch_log_file_real }, 'DEFAULT/use_syslog' => { value => $use_syslog }, 'DEFAULT/use_journal' => { value => $use_journal }, 'DEFAULT/use_json' => { value => $use_json }, diff --git a/releasenotes/notes/remove-watch_log_file-0949dfc2300af8e4.yaml b/releasenotes/notes/remove-watch_log_file-0949dfc2300af8e4.yaml new file mode 100644 index 0000000..f537abd --- /dev/null +++ b/releasenotes/notes/remove-watch_log_file-0949dfc2300af8e4.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``oslo::log::watch_log_file`` parameter has been removed. diff --git a/spec/defines/oslo_log_spec.rb b/spec/defines/oslo_log_spec.rb index 0b0842c..b68a5f2 100644 --- a/spec/defines/oslo_log_spec.rb +++ b/spec/defines/oslo_log_spec.rb @@ -13,7 +13,6 @@ describe 'oslo::log' do is_expected.to contain_keystone_config('DEFAULT/log_date_format').with_value('') is_expected.to contain_keystone_config('DEFAULT/log_file').with_value('') is_expected.to contain_keystone_config('DEFAULT/log_dir').with_value('') - is_expected.to contain_keystone_config('DEFAULT/watch_log_file').with_value('') is_expected.to contain_keystone_config('DEFAULT/use_syslog').with_value('') is_expected.to contain_keystone_config('DEFAULT/use_journal').with_value('') is_expected.to contain_keystone_config('DEFAULT/use_json').with_value('') @@ -39,7 +38,6 @@ describe 'oslo::log' do :log_date_format => '%Y-%m-%d %H:%M:%S', :log_file => '/var/log/keystone/keystone.log', :log_dir => '/var/log/keystone', - :watch_log_file => true, :use_syslog => true, :use_journal => true, :use_json => true, @@ -67,7 +65,6 @@ describe 'oslo::log' do is_expected.to contain_keystone_config('DEFAULT/log_date_format').with_value('%Y-%m-%d %H:%M:%S') is_expected.to contain_keystone_config('DEFAULT/log_file').with_value('/var/log/keystone/keystone.log') is_expected.to contain_keystone_config('DEFAULT/log_dir').with_value('/var/log/keystone') - is_expected.to contain_keystone_config('DEFAULT/watch_log_file').with_value(true) is_expected.to contain_keystone_config('DEFAULT/use_syslog').with_value(true) is_expected.to contain_keystone_config('DEFAULT/use_journal').with_value(true) is_expected.to contain_keystone_config('DEFAULT/use_json').with_value(true)

AltStyle によって変換されたページ (->オリジナル) /