From dede5ffef51a72170264613ad7ab787f8f576f3b Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Wed, 28 Oct 2020 18:44:50 +0100
Subject: [PATCH] [elasticsearch] remove roles unavailable on 6.8

This commit fix a bug introduced in 702ca8f where elasticsearch 6.8
start is failing because ml and remote_cluster_client node roles
are unavailable in 6.8 versions.
---
 elasticsearch/examples/multi/client.yml | 2 --
 elasticsearch/examples/multi/data.yml   | 2 --
 elasticsearch/examples/multi/master.yml | 2 --
 elasticsearch/values.yaml               | 2 --
 4 files changed, 8 deletions(-)

diff --git a/elasticsearch/examples/multi/client.yml b/elasticsearch/examples/multi/client.yml
index dbe5b05aa..e5d9f0e33 100644
--- a/elasticsearch/examples/multi/client.yml
+++ b/elasticsearch/examples/multi/client.yml
@@ -7,8 +7,6 @@ roles:
   master: "false"
   ingest: "false"
   data: "false"
-  ml: "false"
-  remote_cluster_client: "false"
 
 persistence:
   enabled: false
diff --git a/elasticsearch/examples/multi/data.yml b/elasticsearch/examples/multi/data.yml
index 2e3a90935..ecc689337 100644
--- a/elasticsearch/examples/multi/data.yml
+++ b/elasticsearch/examples/multi/data.yml
@@ -7,5 +7,3 @@ roles:
   master: "false"
   ingest: "true"
   data: "true"
-  ml: "false"
-  remote_cluster_client: "false"
diff --git a/elasticsearch/examples/multi/master.yml b/elasticsearch/examples/multi/master.yml
index 6b8c08293..2ca4cca8e 100644
--- a/elasticsearch/examples/multi/master.yml
+++ b/elasticsearch/examples/multi/master.yml
@@ -7,5 +7,3 @@ roles:
   master: "true"
   ingest: "false"
   data: "false"
-  ml: "false"
-  remote_cluster_client: "false"
diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index bd53efdb0..59a873015 100755
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -12,8 +12,6 @@ roles:
   master: "true"
   ingest: "true"
   data: "true"
-  remote_cluster_client: "true"
-# ml: "true" # ml is not availble with elasticsearch-oss
 
 replicas: 3
 minimumMasterNodes: 2