standardizing SDC helm charts

all pods come up
robot health reports HTTP 500 -> mostly due to missing dmaap
resolving filebeat merge conflict
addressing CI comments

do we need a pv/pvc for the logs?

Issue-ID: OOM-747

Change-Id: Id6f1e57fdaf3cd6d9f75e8bc1e5bfde39b91235e
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Signed-off-by: Areli Fuss <af732p@intl.att.com>
(cherry picked from commit fe3e499547c91eadd71bde630594720b918c2af9)

5 files changed, 44 insertions, 500 deletions

diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index d35590ec67..5ae381c746 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -1,41 +1,58 @@
 {
-   "name": "AUTO",
-   "description": "OpenSource-AUTO",
-   "cookbook_versions": {
-            "Deploy-SDandC": "= 1.0.0"
-   },
-   "json_class": "Chef::Environment",
-   "chef_type": "environment",
+    "name": "{{ .Values.global.env.name }}",
+    "description": "OpenSource-{{ .Values.global.env.name }}",
+    "cookbook_versions": {
+        "Deploy-SDandC": "= 1.0.0"
+    },
+    "json_class": "Chef::Environment",
+    "chef_type": "environment",
 
-   "default_attributes": {
-        "CS_VIP": "sdc-cs.{{.Values.nsPrefix}}",
-        "BE_VIP": "sdc-be.{{.Values.nsPrefix}}",
-        "FE_VIP": "sdc-fe.{{.Values.nsPrefix}}",
-        "ES_VIP": "sdc-es.{{.Values.nsPrefix}}",
+    "default_attributes": {
+        "disableHttp": false,
+        "CS_VIP": "{{.Release.Name}}-sdc-cs.{{include "common.namespace" .}}",
+        "BE_VIP": "{{.Release.Name}}-sdc-be.{{include "common.namespace" .}}",
+        "FE_VIP": "{{.Release.Name}}-sdc-fe.{{include "common.namespace" .}}",
+        "ES_VIP": "{{.Release.Name}}-sdc-es.{{include "common.namespace" .}}",
+        "KB_VIP": "{{.Release.Name}}-sdc-kb.{{include "common.namespace" .}}",
         "interfaces": {
             "application": "eth0",
             "private": "eth0"
         },
-                "ECompP": {
-                    "ecomp_rest_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi",
-            "ueb_url_list": "dmaap.{{.Values.nsPrefix}}, dmaap.{{.Values.nsPrefix}}",
+        "ECompP": {
+            "ecomp_rest_url": "http://{{.Release.Name}}-portalapps.{{include "common.namespace" .}}:8989/ONAPPORTAL/auxapi",
+            "ueb_url_list": "{{.Release.Name}}-dmaap.{{include "common.namespace" .}}, {{.Release.Name}}-dmaap.{{include "common.namespace" .}}",
             "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu",
             "app_key": "x9UfO7JsDn8BESVX",
             "inbox_name": "ECOMP-PORTAL-INBOX",
-            "ecomp_redirect_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm",
+            "ecomp_redirect_url": "http://{{.Release.Name}}-portalapps.{{include "common.namespace" .}}:8989/ONAPPORTAL/login.htm",
             "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
-                        "decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
+            "decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
         },
         "UEB": {
             "PublicKey": "iPIxkpAMI8qTcQj8",
             "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
-            "fqdn": ["dmaap.{{.Values.nsPrefix}}", "dmaap.{{.Values.nsPrefix}}"]
+            "fqdn": ["{{.Release.Name}}-dmaap.{{include "common.namespace" .}}", "{{.Release.Name}}-dmaap.{{include "common.namespace" .}}"]
         },
         "Nodes": {
-            "CS": "sdc-cs.{{.Values.nsPrefix}}",
-            "BE": "sdc-be.{{.Values.nsPrefix}}",
-            "FE": "sdc-fe.{{.Values.nsPrefix}}",
-            "ES": "sdc-es.{{.Values.nsPrefix}}"
+            "CS": "{{.Release.Name}}-sdc-cs.{{include "common.namespace" .}}",
+            "BE": "{{.Release.Name}}-sdc-be.{{include "common.namespace" .}}",
+            "FE": "{{.Release.Name}}-sdc-fe.{{include "common.namespace" .}}",
+            "ES": "{{.Release.Name}}-sdc-es.{{include "common.namespace" .}}",
+            "KB": "{{.Release.Name}}-sdc-kb.{{include "common.namespace" .}}"
+        },
+        "Plugins": {
+            "DCAE": {
+                "dcae_discovery_url": "{{.Values.config.environment.dcaeUrl}}",
+                "dcae_source_url": "{{.Values.config.environment.dcaeUrl}}"
+            },
+            "WORKFLOW": {
+                "workflow_discovery_url": "{{.Values.config.environment.workflowUrl}}",
+                "workflow_source_url": "{{.Values.config.environment.workflowUrl}}"
+            }
+        },
+        "VnfRepo": {
+            "vnfRepoPort": "{{.Values.config.environment.vnfRepoPort}}",
+            "vnfRepoHost": "{{.Values.config.environment.vnfRepoHost}}"
         }
     },
     "override_attributes": {
@@ -68,7 +85,10 @@
             "cache_dir": "/var/lib/cassandra/saved_caches",
             "log_file": "/var/lib/cassandra/log/system.log",
             "phi_convict_threshold": "8",
-            "commitlog_dir": "/var/lib/cassandra/commitlog"
+            "commitlog_dir": "/var/lib/cassandra/commitlog",
+            "socket_read_timeout": "20000",
+            "socket_connect_timeout": "20000",
+            "titan_connection_timeout": "10000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/kubernetes/sdc/resources/config/environments/Template.json b/kubernetes/sdc/resources/config/environments/Template.json
deleted file mode 100755
index 247e990f31..0000000000
--- a/kubernetes/sdc/resources/config/environments/Template.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-   "name": "xxx",
-   "description": "OpenSource-xxx",
-   "cookbook_versions": {
-            "Deploy-SDandC": "= 1.0.0"
-   },
-   "json_class": "Chef::Environment",
-   "chef_type": "environment",
-
-   "default_attributes": {
-        "CS_VIP": "yyy",
-        "BE_VIP": "yyy",
-        "FE_VIP": "yyy",
-        "ES_VIP": "yyy",
-        "interfaces": {
-            "application": "eth0",
-            "private": "eth1"
-        },
-		"ECompP": {
-		    "ecomp_rest_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi",
-            "ueb_url_list": "dmaap.{{.Values.nsPrefix}},dmaap.{{.Values.nsPrefix}}", 
-            "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu", 
-            "app_key": "x9UfO7JsDn8BESVX", 
-            "inbox_name": "ECOMP-PORTAL-INBOX", 
-            "ecomp_redirect_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm", 
-            "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
-			"decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
-        }, 
-        "UEB": {
-            "PublicKey": "iPIxkpAMI8qTcQj8",
-            "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
-            "fqdn": ["dmaap.{{.Values.nsPrefix}}", "dmaap.{{.Values.nsPrefix}}"]
-        },
-        "Nodes": {
-            "CS": "yyy",
-            "BE": "yyy",
-            "FE": "yyy",
-            "ES": "yyy"
-        }
-    },
-    "override_attributes": {
-        "FE": {
-            "http_port": "8181",
-            "https_port": "9443"
-        },
-        "BE": {
-            "http_port": "8080",
-            "https_port": "8443"
-        },
-        "elasticsearch": {
-            "cluster_name": "SDC-ES-",
-            "ES_path_home": "/usr/share/elasticsearch",
-            "ES_path_data": "/usr/share/elasticsearch/data",
-            "num_of_replicas": "0",
-            "num_of_shards": "1"
-        },
-
-        "cassandra": {
-            "concurrent_reads": "32",
-            "num_tokens": "256",
-            "data_dir": "/var/lib/cassandra/data",
-            "hinted_handoff_enabled": "true",
-            "cassandra_user": "asdc_user",
-            "cassandra_password": "Aa1234%^!",
-            "concurrent_writes": "32",
-            "cluster_name": "SDC-CS-",
-            "multithreaded_compaction": "false",
-            "cache_dir": "/var/lib/cassandra/saved_caches",
-            "log_file": "/var/lib/cassandra/log/system.log",
-            "phi_convict_threshold": "8",
-            "commitlog_dir": "/var/lib/cassandra/commitlog"
-        }
-    }
-}
-
diff --git a/kubernetes/sdc/resources/config/log/be/logback.xml b/kubernetes/sdc/resources/config/log/be/logback.xml
deleted file mode 100644
index 4d508e3047..0000000000
--- a/kubernetes/sdc/resources/config/log/be/logback.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<configuration scan="true" scanPeriod="3 seconds">

-    <property name="logDir" value="/var/log/onap" />

-    <property name="componentName" scope="system" value="sdc"></property>

-    <property name="subComponentName" scope="system" value="sdc-be"></property>

-    <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />

-    <property file="${config.home}/catalog-be/configuration.yaml" />

-    <property name="enable-all-log" scope="context" value="false" />

-    <!--  log file names -->

-    <property name="errorLogName" value="error" />

-    <property name="metricsLogName" value="metrics" />

-    <property name="auditLogName" value="audit" />

-    <property name="debugLogName" value="debug" />

-    <property name="transactionLogName" value="transaction" />

-    <property name="allLogName" value="all" />

-    <property name="queueSize" value="256" />

-    <property name="maxFileSize" value="50MB" />

-    <property name="maxHistory" value="30" />

-    <property name="totalSizeCap" value="10GB" />

-    <property name="pattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />

-    <!-- All log -->

-    <if condition='property("enable-all-log").equalsIgnoreCase("true")'>

-        <then>

-            <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="ALL_ROLLING">

-                <file>${logDirectory}/${allLogName}.log</file>

-                <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-                    <fileNamePattern>${logDirectory}/${allLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-                    <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-                        <maxFileSize>${maxFileSize}</maxFileSize>

-                    </timeBasedFileNamingAndTriggeringPolicy>

-                    <maxHistory>${maxHistory}</maxHistory>

-                    <totalSizeCap>${totalSizeCap}</totalSizeCap>

-                </rollingPolicy>

-                <encoder>

-                    <pattern>${pattern}</pattern>

-                </encoder>

-            </appender>

-            <appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_ALL">

-                <appender-ref ref="ALL_ROLLING" />

-            </appender>

-        </then>

-    </if>

-    <!-- Error log -->

-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="ERROR_ROLLING">

-        <file>${logDirectory}/${errorLogName}.log</file>

-        <!-- Audit messages filter - deny audit messages -->

-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">

-            <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">

-                <marker>AUDIT_MARKER</marker>

-            </evaluator>

-            <onMismatch>NEUTRAL</onMismatch>

-            <onMatch>DENY</onMatch>

-        </filter>

-        <!-- Transaction messages filter - deny Transaction messages -->

-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">

-            <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">

-                <marker>TRANSACTION_MARKER</marker>

-            </evaluator>

-            <onMismatch>NEUTRAL</onMismatch>

-            <onMatch>DENY</onMatch>

-        </filter>

-        <!-- deny all events with a level below INFO, that is TRACE and DEBUG -->

-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">

-            <level>INFO</level>

-        </filter>

-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-            <fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-                <maxFileSize>${maxFileSize}</maxFileSize>

-            </timeBasedFileNamingAndTriggeringPolicy>

-            <maxHistory>${maxHistory}</maxHistory>

-            <totalSizeCap>${totalSizeCap}</totalSizeCap>

-        </rollingPolicy>

-        <encoder>

-            <pattern>${pattern}</pattern>

-        </encoder>

-    </appender>

-    <!-- Debug log -->

-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="DEBUG_ROLLING">

-        <file>${logDirectory}/${debugLogName}.log</file>

-        <!-- No need to deny audit messages - they are INFO only, will be denied 

-                        anyway -->

-        <!-- Transaction messages filter - deny Transaction messages, there are 

-                        some DEBUG level messages among them -->

-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">

-            <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">

-                <marker>TRANSACTION_MARKER</marker>

-            </evaluator>

-            <onMismatch>NEUTRAL</onMismatch>

-            <onMatch>DENY</onMatch>

-        </filter>

-        <!-- accept DEBUG and TRACE level -->

-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">

-            <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">

-                <expression>e.level.toInt() &lt;= DEBUG.toInt()</expression>

-            </evaluator>

-            <OnMismatch>DENY</OnMismatch>

-            <OnMatch>NEUTRAL</OnMatch>

-        </filter>

-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-            <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-                <maxFileSize>${maxFileSize}</maxFileSize>

-            </timeBasedFileNamingAndTriggeringPolicy>

-            <maxHistory>${maxHistory}</maxHistory>

-            <totalSizeCap>${totalSizeCap}</totalSizeCap>

-        </rollingPolicy>

-        <encoder>

-            <pattern>${pattern}</pattern>

-        </encoder>

-    </appender>

-    <!-- Audit log -->

-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="AUDIT_ROLLING">

-        <file>${logDirectory}/${auditLogName}.log</file>

-        <!-- Audit messages filter - accept audit messages -->

-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">

-            <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">

-                <marker>AUDIT_MARKER</marker>

-            </evaluator>

-            <onMismatch>DENY</onMismatch>

-            <onMatch>ACCEPT</onMatch>

-        </filter>

-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-            <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-                <maxFileSize>${maxFileSize}</maxFileSize>

-            </timeBasedFileNamingAndTriggeringPolicy>

-            <maxHistory>${maxHistory}</maxHistory>

-            <totalSizeCap>${totalSizeCap}</totalSizeCap>

-        </rollingPolicy>

-        <encoder>

-            <pattern>${pattern}</pattern>

-        </encoder>

-    </appender>

-    <!-- SdncTransaction log -->

-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="TRANSACTION_ROLLING">

-        <file>${logDirectory}/${transactionLogName}.log</file>

-        <!-- Transaction messages filter - accept audit messages -->

-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">

-            <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">

-                <marker>TRANSACTION_MARKER</marker>

-            </evaluator>

-            <onMismatch>DENY</onMismatch>

-            <onMatch>ACCEPT</onMatch>

-        </filter>

-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-            <fileNamePattern>${logDirectory}/${transactionLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-                <maxFileSize>${maxFileSize}</maxFileSize>

-            </timeBasedFileNamingAndTriggeringPolicy>

-            <maxHistory>${maxHistory}</maxHistory>

-            <totalSizeCap>${totalSizeCap}</totalSizeCap>

-        </rollingPolicy>

-        <encoder>

-            <pattern>${pattern}</pattern>

-        </encoder>

-    </appender>

-    <!-- Asynchronicity Configurations -->

-    <appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_DEBUG">

-        <queueSize>${queueSize}</queueSize>

-        <appender-ref ref="DEBUG_ROLLING" />

-    </appender>

-    <appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_TRANSACTION">

-        <queueSize>${queueSize}</queueSize>

-        <appender-ref ref="TRANSACTION_ROLLING" />

-    </appender>

-    <appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_ERROR">

-        <queueSize>${queueSize}</queueSize>

-        <appender-ref ref="ERROR_ROLLING" />

-    </appender>

-    <appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_AUDIT">

-        <queueSize>${queueSize}</queueSize>

-        <appender-ref ref="AUDIT_ROLLING" />

-    </appender>

-    <root level="INFO">

-        <appender-ref ref="ASYNC_ERROR" />

-        <appender-ref ref="ASYNC_DEBUG" />

-        <appender-ref ref="ASYNC_AUDIT" />

-        <appender-ref ref="ASYNC_TRANSACTION" />

-        <if condition='property("enable-all-log").equalsIgnoreCase("true")'>

-            <then>

-                <appender-ref ref="ALL_ROLLING" />

-            </then>

-        </if>

-    </root>

-    <logger level="INFO" name="org.openecomp.sdc" />

-</configuration>
\ No newline at end of file
diff --git a/kubernetes/sdc/resources/config/log/fe/logback.xml b/kubernetes/sdc/resources/config/log/fe/logback.xml
deleted file mode 100644
index a8e9ed7264..0000000000
--- a/kubernetes/sdc/resources/config/log/fe/logback.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<configuration scan="true" scanPeriod="3 seconds">

-    <property name="logDir" value="/var/log/onap" />

-    <property name="componentName" scope="system" value="sdc"></property>

-    <property name="subComponentName" scope="system" value="sdc-fe"></property>

-    <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />

-    <property file="${config.home}/catalog-fe/configuration.yaml" />

-    <property name="enable-all-log" scope="context" value="false" />

-    <!--  log file names -->

-    <property name="errorLogName" value="error" />

-    <property name="metricsLogName" value="metrics" />

-    <property name="auditLogName" value="audit" />

-    <property name="debugLogName" value="debug" />

-    <property name="transactionLogName" value="transaction" />

-    <property name="allLogName" value="all" />

-    <property name="queueSize" value="256" />

-    <property name="maxFileSize" value="50MB" />

-    <property name="maxHistory" value="30" />

-    <property name="totalSizeCap" value="10GB" />

-    <property name="pattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />

-    <!-- All log -->

-    <if condition='property("enable-all-log").equalsIgnoreCase("true")'>

-        <then>

-            <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="ALL_ROLLING">

-                <file>${logDirectory}/${allLogName}.log</file>

-                <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-                    <fileNamePattern>${logDirectory}/${allLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-                    <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-                        <maxFileSize>${maxFileSize}</maxFileSize>

-                    </timeBasedFileNamingAndTriggeringPolicy>

-                    <maxHistory>${maxHistory}</maxHistory>

-                    <totalSizeCap>${totalSizeCap}</totalSizeCap>

-                </rollingPolicy>

-                <encoder>

-                    <pattern>${pattern}</pattern>

-                </encoder>

-            </appender>

-            <appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_ALL">

-                <appender-ref ref="ALL_ROLLING" />

-            </appender>

-        </then>

-    </if>

-    <!-- Error log -->

-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="ERROR_ROLLING">

-        <file>${logDirectory}/${errorLogName}.log</file>

-        <!-- Audit messages filter - deny audit messages -->

-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">

-            <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">

-                <marker>AUDIT_MARKER</marker>

-            </evaluator>

-            <onMismatch>NEUTRAL</onMismatch>

-            <onMatch>DENY</onMatch>

-        </filter>

-        <!-- Transaction messages filter - deny Transaction messages -->

-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">

-            <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">

-                <marker>TRANSACTION_MARKER</marker>

-            </evaluator>

-            <onMismatch>NEUTRAL</onMismatch>

-            <onMatch>DENY</onMatch>

-        </filter>

-        <!-- deny all events with a level below INFO, that is TRACE and DEBUG -->

-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">

-            <level>INFO</level>

-        </filter>

-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-            <fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-                <maxFileSize>${maxFileSize}</maxFileSize>

-            </timeBasedFileNamingAndTriggeringPolicy>

-            <maxHistory>${maxHistory}</maxHistory>

-            <totalSizeCap>${totalSizeCap}</totalSizeCap>

-        </rollingPolicy>

-        <encoder>

-            <pattern>${pattern}</pattern>

-        </encoder>

-    </appender>

-    <!-- Debug log -->

-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="DEBUG_ROLLING">

-        <file>${logDirectory}/${debugLogName}.log</file>

-        <!-- No need to deny audit messages - they are INFO only, will be denied 

-                        anyway -->

-        <!-- Transaction messages filter - deny Transaction messages, there are 

-                        some DEBUG level messages among them -->

-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">

-            <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">

-                <marker>TRANSACTION_MARKER</marker>

-            </evaluator>

-            <onMismatch>NEUTRAL</onMismatch>

-            <onMatch>DENY</onMatch>

-        </filter>

-        <!-- accept DEBUG and TRACE level -->

-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">

-            <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">

-                <expression>e.level.toInt() &lt;= DEBUG.toInt()</expression>

-            </evaluator>

-            <OnMismatch>DENY</OnMismatch>

-            <OnMatch>NEUTRAL</OnMatch>

-        </filter>

-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-            <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-                <maxFileSize>${maxFileSize}</maxFileSize>

-            </timeBasedFileNamingAndTriggeringPolicy>

-            <maxHistory>${maxHistory}</maxHistory>

-            <totalSizeCap>${totalSizeCap}</totalSizeCap>

-        </rollingPolicy>

-        <encoder>

-            <pattern>${pattern}</pattern>

-        </encoder>

-    </appender>

-    <!-- Audit log -->

-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="AUDIT_ROLLING">

-        <file>${logDirectory}/${auditLogName}.log</file>

-        <!-- Audit messages filter - accept audit messages -->

-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">

-            <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">

-                <marker>AUDIT_MARKER</marker>

-            </evaluator>

-            <onMismatch>DENY</onMismatch>

-            <onMatch>ACCEPT</onMatch>

-        </filter>

-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-            <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-                <maxFileSize>${maxFileSize}</maxFileSize>

-            </timeBasedFileNamingAndTriggeringPolicy>

-            <maxHistory>${maxHistory}</maxHistory>

-            <totalSizeCap>${totalSizeCap}</totalSizeCap>

-        </rollingPolicy>

-        <encoder>

-            <pattern>${pattern}</pattern>

-        </encoder>

-    </appender>

-    <!-- SdncTransaction log -->

-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="TRANSACTION_ROLLING">

-        <file>${logDirectory}/${transactionLogName}.log</file>

-        <!-- Transaction messages filter - accept audit messages -->

-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">

-            <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">

-                <marker>TRANSACTION_MARKER</marker>

-            </evaluator>

-            <onMismatch>DENY</onMismatch>

-            <onMatch>ACCEPT</onMatch>

-        </filter>

-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-            <fileNamePattern>${logDirectory}/${transactionLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-                <maxFileSize>${maxFileSize}</maxFileSize>

-            </timeBasedFileNamingAndTriggeringPolicy>

-            <maxHistory>${maxHistory}</maxHistory>

-            <totalSizeCap>${totalSizeCap}</totalSizeCap>

-        </rollingPolicy>

-        <encoder>

-            <pattern>${pattern}</pattern>

-        </encoder>

-    </appender>

-    <!-- Asynchronicity Configurations -->

-    <appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_DEBUG">

-        <queueSize>${queueSize}</queueSize>

-        <appender-ref ref="DEBUG_ROLLING" />

-    </appender>

-    <appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_TRANSACTION">

-        <queueSize>${queueSize}</queueSize>

-        <appender-ref ref="TRANSACTION_ROLLING" />

-    </appender>

-    <appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_ERROR">

-        <queueSize>${queueSize}</queueSize>

-        <appender-ref ref="ERROR_ROLLING" />

-    </appender>

-    <appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_AUDIT">

-        <queueSize>${queueSize}</queueSize>

-        <appender-ref ref="AUDIT_ROLLING" />

-    </appender>

-    <root level="INFO">

-        <appender-ref ref="ASYNC_ERROR" />

-        <appender-ref ref="ASYNC_DEBUG" />

-        <appender-ref ref="ASYNC_AUDIT" />

-        <appender-ref ref="ASYNC_TRANSACTION" />

-        <if condition='property("enable-all-log").equalsIgnoreCase("true")'>

-            <then>

-                <appender-ref ref="ALL_ROLLING" />

-            </then>

-        </if>

-    </root>

-    <logger level="INFO" name="org.openecomp.sdc" />

-</configuration>
\ No newline at end of file
diff --git a/kubernetes/sdc/resources/config/sdc-fe/FE_2_setup_configuration.rb b/kubernetes/sdc/resources/config/sdc-fe/FE_2_setup_configuration.rb
deleted file mode 100755
index 5c233a2207..0000000000
--- a/kubernetes/sdc/resources/config/sdc-fe/FE_2_setup_configuration.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-jetty_base="/var/lib/jetty"
-template "catalog-fe-config" do
-   path "#{jetty_base}/config/catalog-fe/configuration.yaml"
-   source "FE-configuration.yaml.erb"
-   owner "jetty"
-   group "jetty"
-   mode "0755"
-   variables({
-      :fe_host_ip   => node['HOST_IP'],
-      :be_host_ip   => "sdc-be.{{.Values.nsPrefix}}",
-      :catalog_port => node['BE'][:http_port],
-      :ssl_port     => node['BE'][:https_port]
-   })
-end
-
-template "onboarding-fe-config" do
- path "#{jetty_base}/config/onboarding-fe/onboarding_configuration.yaml"
- source "FE-onboarding-configuration.yaml.erb"
- owner "jetty"
- group "jetty"
- mode "0755"
- variables({
-    :catalog_ip   => node['HOST_IP'],
-    :catalog_port => node['BE'][:http_port],
-    :ssl_port     => node['BE'][:https_port]
-})
-end