From e610648f4c57c5fccfd8a952b9a098c88b49d5f2 Mon Sep 17 00:00:00 2001
From: Michael Arrastia <MArrasti@amdocs.com>
Date: Fri, 15 Jun 2018 16:30:04 +0100
Subject: Add schemaIngest resource to aai-data-router

This file is required to configure the location of the OXM
files ingested by the data-router microservice.

Change-Id: Ie360f0b80af39c709a5c3dcb18ce06768fbb40a6
Issue-ID: AAI-1229
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
---
 .../resources/config/schemaIngest.properties       | 31 ++++++++++++++++++++++
 .../aai-data-router/templates/configmap.yaml       |  2 +-
 .../aai-data-router/templates/deployment.yaml      | 10 ++++++-
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 kubernetes/aai/charts/aai-data-router/resources/config/schemaIngest.properties

(limited to 'kubernetes/aai/charts/aai-data-router')

diff --git a/kubernetes/aai/charts/aai-data-router/resources/config/schemaIngest.properties b/kubernetes/aai/charts/aai-data-router/resources/config/schemaIngest.properties
new file mode 100644
index 0000000000..9174d2f5a2
--- /dev/null
+++ b/kubernetes/aai/charts/aai-data-router/resources/config/schemaIngest.properties
@@ -0,0 +1,31 @@
+#
+# ============LICENSE_START=======================================================
+# org.onap.aai
+# ================================================================================
+# Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2017-2018 Amdocs
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+#
+
+# Properties for the SchemaLocationsBean
+
+# The AAI Schema jar will be unpacked to bundleconfig/etc
+schemaConfig=NA
+# OXM files named aai_oxm_v*.xml are unpacked here:
+nodeDir=/opt/app/data-router/bundleconfig/etc/oxm
+# DB Edge Rules are unpacked here:
+edgeDir=
+# DB Edge Property files are copied here:
+edgePropsDir=
diff --git a/kubernetes/aai/charts/aai-data-router/templates/configmap.yaml b/kubernetes/aai/charts/aai-data-router/templates/configmap.yaml
index 9652712aa6..badb53fb97 100644
--- a/kubernetes/aai/charts/aai-data-router/templates/configmap.yaml
+++ b/kubernetes/aai/charts/aai-data-router/templates/configmap.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "common.fullname" . }}-prop
   namespace: {{ include "common.namespace" . }}
 data:
-{{ tpl (.Files.Glob "resources/config/data-router.properties").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
diff --git a/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml b/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml
index 2d45a0b097..a045189299 100644
--- a/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml
@@ -82,8 +82,11 @@ spec:
         - mountPath:  /opt/app/data-router/config/auth
           name: {{ include "common.fullname" . }}-auth
         - mountPath:  /opt/app/data-router/config/data-router.properties
-          name: {{ include "common.fullname" . }}-properties
           subPath: data-router.properties
+          name: {{ include "common.fullname" . }}-properties
+        - mountPath:  /opt/app/data-router/config/schemaIngest.properties
+          subPath: schemaIngest.properties
+          name: {{ include "common.fullname" . }}-properties
         - mountPath: /opt/app/data-router/dynamic/routes/entity-event.route
           subPath: entity-event.route
           name: {{ include "common.fullname" . }}-dynamic-route
@@ -116,6 +119,11 @@ spec:
       - name: {{ include "common.fullname" . }}-properties
         configMap:
           name: {{ include "common.fullname" . }}-prop
+          items:
+          - key: data-router.properties
+            path: data-router.properties
+          - key: schemaIngest.properties
+            path: schemaIngest.properties
       - name: {{ include "common.fullname" . }}-dynamic-route
         configMap:
           name: {{ include "common.fullname" . }}-dynamic
-- 
cgit 1.2.3-korg