Merge "Refactor pkgs for contrail-database and fix kitchen tests"
diff --git a/opencontrail/files/2.2/config/log4j.properties b/opencontrail/files/2.2/config/log4j.properties
index 126e749..ca12186 100644
--- a/opencontrail/files/2.2/config/log4j.properties
+++ b/opencontrail/files/2.2/config/log4j.properties
@@ -1,28 +1,11 @@
 {%- from "opencontrail/map.jinja" import config with context %}
-
-# Set root logger level to DEBUG and its only appender to CONSOLE
-log4j.rootLogger={{ config.get('rootlogger', 'TRACE, CONSOLE') }}
+log4j.rootLogger={{ config.get('rootlogger', 'INFO') }}
 log4j.error
 
-log4j.logger.de.fhhannover.inform.irond.proc=TRACE, A1, A2
+log4j.logger.de.fhhannover.inform.irond.proc={{ config.get('rootlogger', 'INFO') }}, A1
 log4j.additivity.de.fhhannover.inform.irond.proc=false
 
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1=org.apache.log4j.FileAppender
+log4j.appender.A1.File=/var/log/contrail/ifmap-server.log
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d - %-5p - [%t] %x - %m%n
-
-log4j.appender.A2=org.apache.log4j.FileAppender
-log4j.appender.A2.File=/var/log/contrail/ifmap-server.log
-log4j.appender.A2.layout=org.apache.log4j.PatternLayout
-log4j.appender.A2.layout.ConversionPattern=%d - %-5p - [%t] %x - %m%n
-
-log4j.logger.de.fhhannover.inform.irond.rawrequests=TRACE, A3
-log4j.additivity.de.fhhannover.inform.irond.rawrequests=false
-log4j.appender.A3=org.apache.log4j.FileAppender
-log4j.appender.A3.file=irond_raw.log
-log4j.appender.A3.layout=org.apache.log4j.PatternLayout
-log4j.appender.A3.layout.ConversionPattern=%d - %-5p - %x - %m%n
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-8r [%t] %-5p %C{1} %x - %m%n
+log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %x - %m%n
diff --git a/opencontrail/files/3.0/config/log4j.properties b/opencontrail/files/3.0/config/log4j.properties
index 126e749..ca12186 100644
--- a/opencontrail/files/3.0/config/log4j.properties
+++ b/opencontrail/files/3.0/config/log4j.properties
@@ -1,28 +1,11 @@
 {%- from "opencontrail/map.jinja" import config with context %}
-
-# Set root logger level to DEBUG and its only appender to CONSOLE
-log4j.rootLogger={{ config.get('rootlogger', 'TRACE, CONSOLE') }}
+log4j.rootLogger={{ config.get('rootlogger', 'INFO') }}
 log4j.error
 
-log4j.logger.de.fhhannover.inform.irond.proc=TRACE, A1, A2
+log4j.logger.de.fhhannover.inform.irond.proc={{ config.get('rootlogger', 'INFO') }}, A1
 log4j.additivity.de.fhhannover.inform.irond.proc=false
 
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1=org.apache.log4j.FileAppender
+log4j.appender.A1.File=/var/log/contrail/ifmap-server.log
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d - %-5p - [%t] %x - %m%n
-
-log4j.appender.A2=org.apache.log4j.FileAppender
-log4j.appender.A2.File=/var/log/contrail/ifmap-server.log
-log4j.appender.A2.layout=org.apache.log4j.PatternLayout
-log4j.appender.A2.layout.ConversionPattern=%d - %-5p - [%t] %x - %m%n
-
-log4j.logger.de.fhhannover.inform.irond.rawrequests=TRACE, A3
-log4j.additivity.de.fhhannover.inform.irond.rawrequests=false
-log4j.appender.A3=org.apache.log4j.FileAppender
-log4j.appender.A3.file=irond_raw.log
-log4j.appender.A3.layout=org.apache.log4j.PatternLayout
-log4j.appender.A3.layout.ConversionPattern=%d - %-5p - %x - %m%n
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-8r [%t] %-5p %C{1} %x - %m%n
+log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %x - %m%n