From 81d5b97aee7376d0c6412817fa0a00eb000f96c9 Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Fri, 26 Apr 2019 12:09:50 -0700
Subject: AAI HELM code transfer

- Remove kubernetes/aai code from OOM.
- Add oom/aai as submodule of OOM in kubernetes/aai
location.

Change-Id: I7741a0cd4b0ecef174569c9450b09f2f7c211f44
Issue-ID: CIMAN-250
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
---
 .../resources/fproxy/config/fproxy.properties      |  2 -
 .../resources/fproxy/config/logback-spring.xml     | 45 ----------------------
 .../aai-gizmo/resources/fproxy/config/readme.txt   |  1 -
 3 files changed, 48 deletions(-)
 delete mode 100644 kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/fproxy.properties
 delete mode 100644 kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/logback-spring.xml
 delete mode 100644 kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/readme.txt

(limited to 'kubernetes/aai/charts/aai-gizmo/resources/fproxy')

diff --git a/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/fproxy.properties b/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/fproxy.properties
deleted file mode 100644
index f512fb71a6..0000000000
--- a/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/fproxy.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-credential.cache.timeout.ms=180000
-transactionid.header.name=X-TransactionId
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/logback-spring.xml b/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/logback-spring.xml
deleted file mode 100644
index 2e6237912f..0000000000
--- a/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/logback-spring.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-    <property name="LOGS" value="./logs/AAF-FPS" />
-    <property name="FILEPREFIX" value="application" />
-
-    <appender name="Console"
-        class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>
-                %d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable
-            </Pattern>
-        </layout>
-    </appender>
-
-    <appender name="RollingFile"
-        class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOGS}/${FILEPREFIX}.log</file>
-        <encoder
-            class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
-        </encoder>
-
-        <rollingPolicy
-            class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- rollover daily and when the file reaches 10 MegaBytes -->
-            <fileNamePattern>${LOGS}/archived/${FILEPREFIX}-%d{yyyy-MM-dd}.%i.log
-            </fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy
-                class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>10MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-        </rollingPolicy>
-    </appender>
-
-    <!-- LOG everything at INFO level -->
-    <root level="info">
-        <appender-ref ref="RollingFile" />
-        <appender-ref ref="Console" />
-    </root>
-
-    <!-- LOG "org.onap.aaf.fproxy*" at INFO level  -->
-    <logger name="org.onap.aaf.fproxy" level="info" />
-
-</configuration>
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/readme.txt b/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/readme.txt
deleted file mode 100644
index 79cf29e73c..0000000000
--- a/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Relevant configuration files need to be copied here to successfully run this service locally.
\ No newline at end of file
-- 
cgit 1.2.3-korg