From 0190a2b5b00c63da60a42305e5d4b249a911fe36 Mon Sep 17 00:00:00 2001
From: Alexander Noskov <anoskov@mirantis.com>
Date: Thu, 20 Jun 2019 02:20:55 +0000
Subject: [PATCH] Uplift elasticseach and align java_opts parameter

Align java_opts parameter for elasticsearch with openstack/openstack-helm-infra
from: https://review.opendev.org/657417

Change-Id: Id75bc46ba5cccc90a5c66b533639a0c7ab681e80
---
 .../charts/osh-infra/osh-infra-logging/elasticsearch.yaml    | 5 ++++-
 global/software/config/versions.yaml                         | 4 ++--
 type/sloop/charts/osh-infra/elasticsearch.yaml               | 5 ++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/global/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml b/global/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml
index aef5de75f..897a20382 100644
--- a/global/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml
+++ b/global/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml
@@ -302,7 +302,10 @@ data:
             max_content_length: 2gb
             pipelining: false
         env:
-          java_opts: "-Xms8g -Xmx8g"
+          java_opts:
+            client: "-Xms8g -Xmx8g"
+            data: "-Xms8g -Xmx8g"
+            master: "-Xms8g -Xmx8g"
         snapshots:
           enabled: true
       curator:
diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index 22360c00a..83accebb7 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -257,7 +257,7 @@ data:
     osh_infra:
       elasticsearch:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e
+        reference: 1f1482bcb71cd3483c6df3ac4bab09653ed6a2e1
         subpath: elasticsearch
         type: git
       fluent_logging:
@@ -272,7 +272,7 @@ data:
         type: git
       helm_toolkit:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e
+        reference: 1f1482bcb71cd3483c6df3ac4bab09653ed6a2e1
         subpath: helm-toolkit
         type: git
       kibana:
diff --git a/type/sloop/charts/osh-infra/elasticsearch.yaml b/type/sloop/charts/osh-infra/elasticsearch.yaml
index f3618ff9d..d31443a0f 100644
--- a/type/sloop/charts/osh-infra/elasticsearch.yaml
+++ b/type/sloop/charts/osh-infra/elasticsearch.yaml
@@ -27,5 +27,8 @@ data:
     conf:
       elasticsearch:
         env:
-          java_opts: "-Xms768m -Xmx768m"
+          java_opts:
+            client: "-Xms768m -Xmx768m"
+            data: "-Xms768m -Xmx768m"
+            master: "-Xms768m -Xmx768m"
 ...