From 4f87dbd6580b8bf84ee60a7cbb7467cae961f97e Mon Sep 17 00:00:00 2001 From: vgusev Date: Wed, 6 Dec 2017 12:20:36 +0400 Subject: [PATCH] Switch Elasticsearch to 5 version Change-Id: Ic5f0937b6288b181a6b8708a85173ad15eb4d65c --- elasticsearch/map.jinja | 2 +- metadata/service/client.yml | 2 +- metadata/service/server/cluster.yml | 2 +- metadata/service/server/local.yml | 2 +- metadata/service/server/single.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 -- 2.32.7