commit 22eaeb9cd8b267655330326461fca83d1ae3faea
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Dec 21 12:01:11 2017 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Thu Dec 21 12:01:11 2017 +0000
tree 8433e9f7e992b161207c7d9603200ef6eb1f3e3f
parent 869a6ccf6ee4f4482a12c5e0a2730e3fe0024cd4
parent 4f87dbd6580b8bf84ee60a7cbb7467cae961f97e

Merge "Switch Elasticsearch to 5 version"

elasticsearch/map.jinja

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 @@
   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') %}

metadata/service/client.yml

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 @@
 - elasticsearch
 parameters:
   _param:
-    elasticsearch_version: 2
+    elasticsearch_version: 5
   elasticsearch:
     client:
       enabled: true

metadata/service/server/cluster.yml

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 @@
 - service.elasticsearch.support
 parameters:
   _param:
-    elasticsearch_version: 2
+    elasticsearch_version: 5
   elasticsearch:
     server:
       enabled: true

metadata/service/server/local.yml

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 @@
 - service.elasticsearch.support
 parameters:
   _param:
-    elasticsearch_version: 2
+    elasticsearch_version: 5
   elasticsearch:
     server:
       enabled: true

metadata/service/server/single.yml

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 @@
 - service.elasticsearch.support
 parameters:
   _param:
-    elasticsearch_version: 2
+    elasticsearch_version: 5
   elasticsearch:
     server:
       enabled: true