From 634417bf8770b1e9db7d42fec550330a1c9cc72d Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 8 Oct 2020 13:16:38 +0200 Subject: [PATCH 1/2] Add default jvm_options for epicli upgrade --- .../roles/opendistro_for_elasticsearch/defaults/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/opendistro_for_elasticsearch/defaults/main.yml b/core/src/epicli/data/common/ansible/playbooks/roles/opendistro_for_elasticsearch/defaults/main.yml index 247770a2f7..c944a5f916 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/opendistro_for_elasticsearch/defaults/main.yml +++ b/core/src/epicli/data/common/ansible/playbooks/roles/opendistro_for_elasticsearch/defaults/main.yml @@ -17,3 +17,5 @@ specification: data: /var/lib/elasticsearch repo: /var/lib/elasticsearch-snapshots logs: /var/log/elasticsearch + jvm_options: + Xmx: 1g # see https://www.elastic.co/guide/en/elasticsearch/reference/7.9/heap-size.html From eaaec7c37e5611ffc686a9d4a19692ebaeead7eb Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 9 Oct 2020 07:17:52 +0200 Subject: [PATCH 2/2] Add 'current_group_name' for upgrade ODFE --- core/src/epicli/data/common/ansible/playbooks/upgrade.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/epicli/data/common/ansible/playbooks/upgrade.yml b/core/src/epicli/data/common/ansible/playbooks/upgrade.yml index cbcc45ec7b..9a34ca9817 100644 --- a/core/src/epicli/data/common/ansible/playbooks/upgrade.yml +++ b/core/src/epicli/data/common/ansible/playbooks/upgrade.yml @@ -117,7 +117,7 @@ name: upgrade tasks_from: opendistro_for_elasticsearch vars: - current_group_name: logging + current_group_name: "logging" - hosts: opendistro_for_elasticsearch become: true @@ -127,6 +127,8 @@ - import_role: name: upgrade tasks_from: opendistro_for_elasticsearch + vars: + current_group_name: "opendistro_for_elasticsearch" - hosts: kibana become: true