X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Ftemplates%2Fconfigmap.yaml;h=bd5f9b91f99624d99fc45ce3aecbdc70b0562c77;hb=00107b55f9b831b6bd5834bea34ea7df330e1f30;hp=78235bcd4f0884b8223b4511a1ed3d82a6af877a;hpb=ea2eb8d96d06f459526343322ad27007c7fdba8b;p=oom.git

diff --git a/kubernetes/aai/templates/configmap.yaml b/kubernetes/aai/templates/configmap.yaml
index 78235bcd4f..bd5f9b91f9 100644
--- a/kubernetes/aai/templates/configmap.yaml
+++ b/kubernetes/aai/templates/configmap.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2018 Amdocs, Bell Canada, AT&T
+#
+# 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.
+
 # this is a shared resource for subcharts
 apiVersion: v1
 kind: ConfigMap
@@ -13,23 +27,25 @@ metadata:
   name: aai-deployment-configmap
   namespace: {{ include "common.namespace" . }}
 data:
-{{ tpl (.Files.Glob "resources/config/haproxy/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/haproxy/haproxy.cfg").AsConfig . | indent 2 }}
 ---
-# this is a shared resource for subcharts
 apiVersion: v1
-kind: ConfigMap
+kind: Secret
 metadata:
-  name: aai-chef-config
+  name: aai-haproxy-secret
   namespace: {{ include "common.namespace" . }}
+type: Opaque
 data:
-{{ tpl (.Files.Glob "resources/config/aai-data/chef-config/dev/.knife/solo.rb").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/haproxy/aai.pem").AsSecrets . | indent 2 }}
+# This is a shared key for both resources and traversal
 ---
-# this is a shared resource for subcharts
 apiVersion: v1
-kind: ConfigMap
+kind: Secret
 metadata:
-  name: aai-resources-environments
+  name: aai-auth-truststore-secret
   namespace: {{ include "common.namespace" . }}
+type: Opaque
 data:
-{{ tpl (.Files.Glob "resources/config/aai-data/environments/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/aai/*").AsSecrets . | indent 2 }}
+