X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fmulticloud%2Ftemplates%2Fconfigmap.yaml;fp=kubernetes%2Fmulticloud%2Ftemplates%2Fmulticloud-log-configmap.yaml;h=e420fb99f794b94d3aaf86c7129f57c1473b4881;hb=41ef22e8cb76ddf3480cbd119bd741db62cfb578;hp=1050f1061ee744dda4e16450d8f929d32a09f667;hpb=72f4e9b34adb4b2e134ee44e9fe0a2e039453378;p=oom.git

diff --git a/kubernetes/multicloud/templates/multicloud-log-configmap.yaml b/kubernetes/multicloud/templates/configmap.yaml
similarity index 53%
rename from kubernetes/multicloud/templates/multicloud-log-configmap.yaml
rename to kubernetes/multicloud/templates/configmap.yaml
index 1050f1061e..e420fb99f7 100644
--- a/kubernetes/multicloud/templates/multicloud-log-configmap.yaml
+++ b/kubernetes/multicloud/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{/*
 # Copyright © 2017 Amdocs, Bell Canada
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,45 +12,20 @@
 # 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.disableVidVidServer }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: multicloud-filebeat-configmap
-  namespace: {{ .Values.nsPrefix }}
+  namespace: {{ include "common.namespace" . }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: multicloud-framework-log-configmap
-  namespace: {{ .Values.nsPrefix }}
+  name: {{ include "common.fullname" . }}-log-configmap
+  namespace: {{ include "common.namespace" . }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/framework/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: multicloud-vio-log-configmap
-  namespace: {{ .Values.nsPrefix }}
-data:
-{{ tpl (.Files.Glob "resources/config/log/vio/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: multicloud-ocata-log-configmap
-  namespace: {{ .Values.nsPrefix }}
-data:
-{{ tpl (.Files.Glob "resources/config/log/ocata/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: multicloud-windriver-log-configmap
-  namespace: {{ .Values.nsPrefix }}
-data:
-{{ tpl (.Files.Glob "resources/config/log/windriver/*").AsConfig . | indent 2 }}
-#{{ end }}