Merge "Bump Puppet version 4.x to 5.x"

diff --git a/CHANGELOG b/CHANGELOG
index 9ba683551b3092c595ad17d53c46d3a410bc23c2..620eee97be5bcabab27209b822d432bcfd56312b 100644 (file)
--- 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 4ca99bbe3a6dbdcb8cbe17d61d31dfb8389b2d93..6ceaf65e4020f09e81830004918f74745a1877d8 100644 (file)
--- 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 cfdb2ea43fa27df41252cedab4f54a88afd40074..b90c5d813fc3e97b2a92d77aacfc4ec8a50750af 100644 (file)
--- 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 de914a3f3f181903139fc216afc7af0327bf81fd..1c5688e9956108033e3cdcc0425142c3d62c3518 100644 (file)
--- 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 84b19bce07383d702747cf6a9b2cee4a1209f5a3..bd99b15fdad1f1775849dc997654e2e52666e822 100644 (file)
--- 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 ed917e7632b6602801ddcb6ff4f5169220070f1e..c430a55f9fa1a60e20bfcc3602c98940f250adda 100644 (file)
--- 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 3318939e7725762859afd5c4877b14b47d71a469..564be8d980bb9e3e148924b648c3cd2ab5f3f9bf 100644 (file)
--- 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 56ca54f7136c57050faf98443f25143646d908a3..8a8aa07888e5575e5e308bca43daa2b4375cca99 100644 (file)
--- 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')