From: Jakub Josef <jjosef@mirantis.com>
Date: Wed, 27 Dec 2017 17:58:46 +0000 (+0000)
Subject: Merge "provide index creation without date-mapping"
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=commitdiff_plain;h=bbc88d9125101e83537ac5a0176a751a08af45f4;hp=c107a13cec2d7285d4b4d1dba77d1ca6084b2e09

Merge "provide index creation without date-mapping"
---

diff --git a/elasticsearch/map.jinja b/elasticsearch/map.jinja
index b69b369..056beed 100644
--- a/elasticsearch/map.jinja
+++ b/elasticsearch/map.jinja
@@ -16,7 +16,7 @@ RedHat:
   service: elasticsearch
   version: '1.4.4'
 default:
-  version: 2
+  version: 5
 {%- endload %}
 
 {%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('elasticsearch:server'), base='default') %}
diff --git a/metadata/service/client.yml b/metadata/service/client.yml
index 203c763..72efe86 100644
--- a/metadata/service/client.yml
+++ b/metadata/service/client.yml
@@ -2,7 +2,7 @@ applications:
 - elasticsearch
 parameters:
   _param:
-    elasticsearch_version: 2
+    elasticsearch_version: 5
   elasticsearch:
     client:
       enabled: true
diff --git a/metadata/service/server/cluster.yml b/metadata/service/server/cluster.yml
index 2ff8db5..1f9e961 100644
--- a/metadata/service/server/cluster.yml
+++ b/metadata/service/server/cluster.yml
@@ -4,7 +4,7 @@ classes:
 - service.elasticsearch.support
 parameters:
   _param:
-    elasticsearch_version: 2
+    elasticsearch_version: 5
   elasticsearch:
     server:
       enabled: true
diff --git a/metadata/service/server/local.yml b/metadata/service/server/local.yml
index 24f577e..7980251 100644
--- a/metadata/service/server/local.yml
+++ b/metadata/service/server/local.yml
@@ -4,7 +4,7 @@ classes:
 - service.elasticsearch.support
 parameters:
   _param:
-    elasticsearch_version: 2
+    elasticsearch_version: 5
   elasticsearch:
     server:
       enabled: true
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 397a0b6..01e7436 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -4,7 +4,7 @@ classes:
 - service.elasticsearch.support
 parameters:
   _param:
-    elasticsearch_version: 2
+    elasticsearch_version: 5
   elasticsearch:
     server:
       enabled: true