commit 15e62f813461d519da6e766f72f60f9a07fb6628
author vgusev <vgusev@mirantis.com> Wed Nov 08 13:21:39 2017 +0400
committer Vitaly Gusev <vgusev@mirantis.com> Wed Nov 22 11:53:22 2017 +0000
tree f0fb90ce78d5c059676655bdb88ac74c9c11b970
parent a54736f0beb8be8b5f15ba3ed5b5894f60639d00

Add a possibility to deploy Elasticsearch 5.x version

Elasticsearch 2.x version is deployed by default

Change-Id: I78e714807cf5925a9619961ab145f27ef0210652

metadata/service/client.yml

diff --git a/metadata/service/client.yml b/metadata/service/client.yml
index 701dc35..203c763 100644
--- a/metadata/service/client.yml
+++ b/metadata/service/client.yml
@@ -1,19 +1,24 @@
 applications:
 - elasticsearch
 parameters:
+  _param:
+    elasticsearch_version: 2
   elasticsearch:
     client:
       enabled: true
       index:
         log:
+          force_operation: true
           enabled: true
-          template: elasticsearch/files/es_template_log.json
+          template: elasticsearch/files/v${_param:elasticsearch_version}/es_template_log.json
         audit:
+          force_operation: true
           enabled: true
-          template: elasticsearch/files/es_template_audit.json
+          template: elasticsearch/files/v${_param:elasticsearch_version}/es_template_audit.json
         notification:
+          force_operation: true
           enabled: true
-          template: elasticsearch/files/es_template_notification.json
-        kibana4:
+          template: elasticsearch/files/v${_param:elasticsearch_version}/es_template_notification.json
+        kibana:
           enabled: true
-          template: elasticsearch/files/es_template_kibana4.json
+          template: elasticsearch/files/v${_param:elasticsearch_version}/es_template_kibana.json

metadata/service/server/cluster.yml

diff --git a/metadata/service/server/cluster.yml b/metadata/service/server/cluster.yml
index e432f74..2ff8db5 100644
--- a/metadata/service/server/cluster.yml
+++ b/metadata/service/server/cluster.yml
@@ -3,9 +3,12 @@
 classes:
 - service.elasticsearch.support
 parameters:
+  _param:
+    elasticsearch_version: 2
   elasticsearch:
     server:
       enabled: true
+      version: ${_param:elasticsearch_version}
       bind:
         address: 0.0.0.0
         port: 9200

metadata/service/server/local.yml

diff --git a/metadata/service/server/local.yml b/metadata/service/server/local.yml
index 259f468..24f577e 100644
--- a/metadata/service/server/local.yml
+++ b/metadata/service/server/local.yml
@@ -3,9 +3,12 @@
 classes:
 - service.elasticsearch.support
 parameters:
+  _param:
+    elasticsearch_version: 2
   elasticsearch:
     server:
       enabled: true
+      version: ${_param:elasticsearch_version}
       bind:
         address: 127.0.0.1
         port: 9200

metadata/service/server/single.yml

diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 264186c..397a0b6 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -3,9 +3,12 @@
 classes:
 - service.elasticsearch.support
 parameters:
+  _param:
+    elasticsearch_version: 2
   elasticsearch:
     server:
       enabled: true
+      version: ${_param:elasticsearch_version}
       bind:
         address: 0.0.0.0
         port: 9200