Merge "Remove watch_log_file"

openstack/puppet-oslo

Code Issues Proposed changes

Browse Source

This commit is contained in:

Zuul

2025年04月22日 13:56:38 +00:00

committed by Gerrit Code Review

parent 5c365da5b7 036b11b917

commit 5715c387b4

3 changed files with 4 additions and 20 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/log.pp

View File

@@ -106,12 +106,6 @@

#(Optional)Enablesordisablesfatalstatusofdeprecations(booleanvalue).

#Defaultsto$facts['os_service_default']

#

#DEPRECATEDPARAMETERS

#

#[*watch_log_file*]

#(Optional)Useslogginghandlerdesignedtowatchfilesystem(booleanvalue).

#Defaultstoundef

#

defineoslo::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'],

#DEPRECATEDPARMETERS

$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 },

4
releasenotes/notes/remove-watch_log_file-0949dfc2300af8e4.yaml Normal file

View File

@@ -0,0 +1,4 @@

---

upgrade:

- |

The ``oslo::log::watch_log_file`` parameter has been removed.

3
spec/defines/oslo_log_spec.rb

View File

@@ -13,7 +13,6 @@ describe 'oslo::log' do

is_expected.to contain_keystone_config('DEFAULT/log_date_format').with_value('<SERVICE DEFAULT>')

is_expected.to contain_keystone_config('DEFAULT/log_file').with_value('<SERVICE DEFAULT>')

is_expected.to contain_keystone_config('DEFAULT/log_dir').with_value('<SERVICE DEFAULT>')

is_expected.to contain_keystone_config('DEFAULT/watch_log_file').with_value('<SERVICE DEFAULT>')

is_expected.to contain_keystone_config('DEFAULT/use_syslog').with_value('<SERVICE DEFAULT>')

is_expected.to contain_keystone_config('DEFAULT/use_journal').with_value('<SERVICE DEFAULT>')

is_expected.to contain_keystone_config('DEFAULT/use_json').with_value('<SERVICE DEFAULT>')

@@ -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)