Remove append_on_no_match parameter

append_on_no_match is true by default. This patch removes the
reduntant line. And also TripleO does not recognise that parameter
during installation.  Logging size and rollover is also fixed to
only be configured when using file logging.

Change-Id: Ic0a515dc8f40ec76840bca150805a4f1614b3e32
Signed-Off-By: Janki Chhatbar <jchhatba@redhat.com>

diff --git a/manifests/config.pp b/manifests/config.pp
index 2dc97fd151ae8cefaa79b6637f094012764982cd..7ffcbc2b48f75bf54ecd50a0a0e29f9f1bc26b79 100644 (file)
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -205,28 +205,28 @@ class opendaylight::config {
       match  => '^log4j.rootLogger.*$'
     }
     file_line { 'logappender':
-      ensure             => present,
-      path               => '/opt/opendaylight/etc/org.ops4j.pax.logging.cfg',
-      line               => 'log4j.appender.stdout.direct=true',
-      after              => 'log4j.appender.stdout=org.apache.log4j.ConsoleAppender',
-      match              => '^log4j.appender.stdout.direct.*$',
-      append_on_no_match => true
+      ensure => present,
+      path   => '/opt/opendaylight/etc/org.ops4j.pax.logging.cfg',
+      line   => 'log4j.appender.stdout.direct=true',
+      after  => 'log4j.appender.stdout=org.apache.log4j.ConsoleAppender',
+      match  => '^log4j.appender.stdout.direct.*$'
+    }
+  } else {
+    # Set maximum ODL log file size
+    file_line { 'logmaxsize':
+      ensure => present,
+      path   => '/opt/opendaylight/etc/org.ops4j.pax.logging.cfg',
+      line   => "log4j.appender.out.maxFileSize=${::opendaylight::log_max_size}",
+      match  => '^log4j.appender.out.maxFileSize.*$'
     }
-  }
-  # Set maximum ODL log file size
-  file_line { 'logmaxsize':
-    ensure => present,
-    path   => '/opt/opendaylight/etc/org.ops4j.pax.logging.cfg',
-    line   => "log4j.appender.out.maxFileSize=${::opendaylight::log_max_size}",
-    match  => '^log4j.appender.out.maxFileSize.*$'
-  }
 
-  # Set maximum number of ODL log file rollovers to preserve
-  file_line { 'logmaxrollover':
-    ensure => present,
-    path   => '/opt/opendaylight/etc/org.ops4j.pax.logging.cfg',
-    line   => "log4j.appender.out.maxBackupIndex=${::opendaylight::log_max_rollover}",
-    match  => '^log4j.appender.out.maxBackupIndex.*$'
+    # Set maximum number of ODL log file rollovers to preserve
+    file_line { 'logmaxrollover':
+      ensure => present,
+      path   => '/opt/opendaylight/etc/org.ops4j.pax.logging.cfg',
+      line   => "log4j.appender.out.maxBackupIndex=${::opendaylight::log_max_rollover}",
+      match  => '^log4j.appender.out.maxBackupIndex.*$'
+    }
   }
 
   # Configure ODL HA if enabled

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3bf6f43d4f2aaee3e6e0e20ed698b5aab18f6697..27b3773d419e15f5bb3c246bdd9ea0b65a1c4633 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -81,8 +81,7 @@ def log_settings(options = {})
         'path'               => '/opt/opendaylight/etc/org.ops4j.pax.logging.cfg',
         'line'               => 'log4j.appender.stdout.direct=true',
         'after'              => 'log4j.appender.stdout=org.apache.log4j.ConsoleAppender',
-        'match'              => '^log4j.appender.stdout.direct.*$',
-        'append_on_no_match' => true
+        'match'              => '^log4j.appender.stdout.direct.*$'
       )
     }
   else