From: Anil Belur Date: Thu, 7 Mar 2019 17:14:55 +0000 (+0000) Subject: Merge "Bump Puppet version 4.x to 5.x" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=HEAD;hp=89856938a77fadf02d9297c05cc0cb58a3e18b7c;p=integration%2Fpackaging%2Fpuppet-opendaylight.git Merge "Bump Puppet version 4.x to 5.x" --- diff --git a/CHANGELOG b/CHANGELOG index 9ba6835..620eee9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -90,3 +90,5 @@ - Adds configuration for OVSDB inactivity probe timer 2018-10-08 Release 8.5.0 - Bump ODL version to Neon +2018-10-08 Release 8.6.0 +- Change default log size/rotation from 10GB/2 to 500MB/4 diff --git a/README.markdown b/README.markdown index 4ca99bb..6ceaf65 100644 --- a/README.markdown +++ b/README.markdown @@ -307,7 +307,7 @@ Maximum size of OpenDaylight's log file, `/opt/opendaylight/data/log/karaf.log`. Once this size is reached, the log will be rolled over, with up to `log_max_rollover` log rollovers preserved in total. -Default: `10GB` +Default: `500MB` Valid options: A valid size as a string with unit specified. @@ -319,7 +319,7 @@ Note that if this is set to 1, log rollovers will result in loosing newly logged data. It's recommended to use values greater than one to prune from the end of the log. -Default: `2` +Default: `4` Valid options: An integer greater than 0. diff --git a/manifests/params.pp b/manifests/params.pp index cfdb2ea..b90c5d8 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -23,8 +23,8 @@ class opendaylight::params { $manage_repositories = true $username = 'admin' $password = 'admin' - $log_max_size = '10GB' - $log_max_rollover = 2 + $log_max_size = '500MB' + $log_max_rollover = 4 $log_rollover_fileindex = 'min' $log_pattern = '%d{ISO8601} | %-5p | %-16t | %-60c{6} | %m%n' $enable_paxosgi_logger = false diff --git a/metadata.json b/metadata.json index de914a3..1c5688e 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "opendaylight-opendaylight", - "version": "8.5.0", + "version": "8.6.0", "author": "Daniel Farrell", "summary": "Puppet module that installs and configures the OpenDaylight SDN controller", "license": "BSD-2-Clause", diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb index 84b19bc..bd99b15 100644 --- a/spec/acceptance/class_spec.rb +++ b/spec/acceptance/class_spec.rb @@ -85,29 +85,29 @@ describe 'opendaylight class' do context 'log to file customising size' do # Call specialized helper fn to install OpenDaylight - install_odl(log_max_size: '1GB') + install_odl(log_max_size: '100MB') # Call specialized helper fn for log settings validations - log_settings_validations(log_max_size: '1GB') + log_settings_validations(log_max_size: '100MB') end context 'log to file customising rollover' do # Call specialized helper fn to install OpenDaylight - install_odl(log_max_rollover: 3) + install_odl(log_max_rollover: 10) # Call specialized helper fn for log settings validations - log_settings_validations(log_max_rollover: 3) + log_settings_validations(log_max_rollover: 10) end context 'log to file customising size and rollover' do # Call specialized helper fn to install OpenDaylight - install_odl(log_max_size: '1GB', - log_max_rollover: 3, + install_odl(log_max_size: '250MB', + log_max_rollover: 8, log_rollover_fileIndex: 'min') # Call specialized helper fn for log settings validations - log_settings_validations(log_max_size: '1GB', - log_max_rollover: 3, + log_settings_validations(log_max_size: '250MB', + log_max_rollover: 8, log_rollover_fileIndex: 'min') end diff --git a/spec/classes/opendaylight_spec.rb b/spec/classes/opendaylight_spec.rb index ed917e7..c430a55 100644 --- a/spec/classes/opendaylight_spec.rb +++ b/spec/classes/opendaylight_spec.rb @@ -479,7 +479,7 @@ describe 'opendaylight' do }} let(:params) {{ - :log_max_size => '1GB', + :log_max_size => '100MB', }} # Run shared tests applicable to all supported OSs @@ -487,7 +487,7 @@ describe 'opendaylight' do generic_tests # Run test specific to log settings - log_settings(log_max_size: '1GB') + log_settings(log_max_size: '100MB') end context 'log to file customizing rollover' do @@ -498,7 +498,7 @@ describe 'opendaylight' do }} let(:params) {{ - :log_max_rollover => 3, + :log_max_rollover => 10, }} # Run shared tests applicable to all supported OSs @@ -506,7 +506,7 @@ describe 'opendaylight' do generic_tests # Run test specific to log settings - log_settings(log_max_rollover: 3) + log_settings(log_max_rollover: 10) end context 'log to file customizing size and rollover' do @@ -517,8 +517,8 @@ describe 'opendaylight' do }} let(:params) {{ - :log_max_size => '1GB', - :log_max_rollover => 3, + :log_max_size => '250MB', + :log_max_rollover => 8, :log_rollover_fileindex => 'min' }} @@ -527,8 +527,8 @@ describe 'opendaylight' do generic_tests # Run test specific to log settings - log_settings(log_max_size: '1GB', - log_max_rollover: 3, + log_settings(log_max_size: '250MB', + log_max_rollover: 8, log_rollover_fileindex: 'min') end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3318939..564be8d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -117,8 +117,8 @@ end # Shared tests that specialize in testing log file size and rollover def log_settings(options = {}) # Extraxt params. The dafault value should be same as in opendaylight::params - log_max_size = options.fetch(:log_max_size, '10GB') - log_max_rollover = options.fetch(:log_max_rollover, 2) + log_max_size = options.fetch(:log_max_size, '500MB') + log_max_rollover = options.fetch(:log_max_rollover, 4) log_rollover_fileindex = options.fetch(:log_rollover_fileindex, 'min') log_pattern = options.fetch(:log_pattern, '%d{ISO8601} | %-5p | %-16t | %-60c{6} | %m%n') log_mechanism = options.fetch(:log_mechanism, 'file') diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 56ca54f..8a8aa07 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -66,8 +66,8 @@ def install_odl(options = {}) ha_db_modules = options.fetch(:ha_db_modules, { 'default' => false }) username = options.fetch(:username, 'admin') password = options.fetch(:password, 'admin') - log_max_size = options.fetch(:log_max_size, '10GB') - log_max_rollover = options.fetch(:log_max_rollover, 2) + log_max_size = options.fetch(:log_max_size, '500MB') + log_max_rollover = options.fetch(:log_max_rollover, 4) log_pattern = options.fetch(:log_pattern, '%d{ISO8601} | %-5p | %-16t | %-60c{6} | %m%n') log_rollover_fileindex = options.fetch(:log_rollover_fileindex, 'min') enable_paxosgi_logger = options.fetch(:enable_paxosgi_logger, false) @@ -251,8 +251,8 @@ end # Shared function for validations related to log file settings def log_settings_validations(options = {}) # Should contain log level config file with correct file size and rollover values - log_max_size = options.fetch(:log_max_size, '10GB') - log_max_rollover = options.fetch(:log_max_rollover, 2) + log_max_size = options.fetch(:log_max_size, '500MB') + log_max_rollover = options.fetch(:log_max_rollover, 4) log_pattern = options.fetch(:log_pattern, '%d{ISO8601} | %-5p | %-16t | %-60c{6} | %m%n') log_rollover_fileindex = options.fetch(:log_rollover_fileindex, 'min') log_mechanism = options.fetch(:log_mechanism, 'file')