X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Ftemplates%2Felasticsearch-deployment.yaml;h=902f31ef6088890458f8f580ed45360b5bd9881d;hb=e04b2feb855e5ab20e28c867d2bd7f89f6b8c425;hp=1c2a2ad57b0a8f00418315bf9fca68b902f5146c;hpb=4b881972b63ab1c08a5ad4946a8550572f8f066d;p=oom.git

diff --git a/kubernetes/aai/templates/elasticsearch-deployment.yaml b/kubernetes/aai/templates/elasticsearch-deployment.yaml
index 1c2a2ad57b..902f31ef60 100644
--- a/kubernetes/aai/templates/elasticsearch-deployment.yaml
+++ b/kubernetes/aai/templates/elasticsearch-deployment.yaml
@@ -1,21 +1,59 @@
+# 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.disableAaiElasticsearch }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: elasticsearch
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  name: aai-elasticsearch
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.elasticsearchReplicas }}
   selector:
     matchLabels:
-      app: elasticsearch
+      app: aai-elasticsearch
   template:
     metadata:
       labels:
-        app: elasticsearch
-      name: elasticsearch
+        app: aai-elasticsearch
+      name: aai-elasticsearch
     spec:
-      hostname: elasticsearch
+      initContainers:
+      - command:
+        - /bin/sh
+        - -c
+        - |
+          mkdir -p /logroot/elasticsearch/es-data
+          chmod -R 777 /logroot/elasticsearch/es-data
+          chown -R root:root /logroot
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        securityContext:
+          privileged: true
+        image: {{ .Values.image.es_bb }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: init-sysctl
+        volumeMounts:
+        - name: elasticsearch-data
+          mountPath: /logroot/
+      hostname: aai-elasticsearch
       containers:
-      - name: elasticsearch
+      - name: aai-elasticsearch
         image: "{{ .Values.image.elasticsearchImage }}:{{ .Values.image.elasticsearchVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         ports:
@@ -26,16 +64,24 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 10
         volumeMounts:
+        - name: localtime
+          mountPath: /etc/localtime
+          readOnly: true
         - name: elasticsearch-config
+          subPath: elasticsearch.yml
           mountPath: /usr/share/elasticsearch/config/elasticsearch.yml
         - name: elasticsearch-data
           mountPath: /usr/share/elasticsearch/data
       volumes:
-      - name: elasticsearch-config
+      - name: localtime
         hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/elasticsearch/config/elasticsearch.yml"
+          path: /etc/localtime
+      - name: elasticsearch-config
+        configMap:
+          name: aai-elasticsearch-configmap
       - name: elasticsearch-data
         hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/elasticsearch/es-data"
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/elasticsearch/data"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}