X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=kubernetes%2Faai%2Ftemplates%2Fdata-router-configmap.yaml;h=8c2d988e66100c5029915ceac4e9f08c2be17920;hb=e04b2feb855e5ab20e28c867d2bd7f89f6b8c425;hp=57822135b2803fd6aebe18a3bdc69cd742fe287b;hpb=cb8d6dcaf8e8ca842111b4e498b37925da7371d3;p=oom.git

diff --git a/kubernetes/aai/templates/data-router-configmap.yaml b/kubernetes/aai/templates/data-router-configmap.yaml
index 57822135b2..8c2d988e66 100644
--- a/kubernetes/aai/templates/data-router-configmap.yaml
+++ b/kubernetes/aai/templates/data-router-configmap.yaml
@@ -1,49 +1,63 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+
 #{{ if not .Values.disableAaiDataRouter }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: data-router-prop-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-data-router-prop-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/data-router/appconfig/data-router.properties").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: data-router-model-v8-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-data-router-model-v8-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/data-router/appconfig/model/aai_oxm_v8.xml").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: data-router-model-v9-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-data-router-model-v9-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/data-router/appconfig/model/aai_oxm_v9.xml").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: data-router-model-v10-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-data-router-model-v10-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/data-router/appconfig/model/aai_oxm_v10.xml").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: data-router-model-v11-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-data-router-model-v11-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/data-router/appconfig/model/aai_oxm_v11.xml").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: data-router-secret
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-data-router-secret
+  namespace: {{ .Values.nsPrefix }}
 type: Opaque
 data:
 {{ tpl (.Files.Glob "resources/config/data-router/appconfig/auth/*").AsSecrets . | indent 2 }}
@@ -51,8 +65,8 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: data-router-dynamic-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-data-router-dynamic-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/data-router/dynamic/routes/entity-event.route").AsConfig . | indent 2 }}
 {{ tpl (.Files.Glob "resources/config/data-router/dynamic/conf/entity-event-policy.xml").AsConfig . | indent 2 }}