Add a new parameter for Elasticsearch
Added a new parameter version to specify
which version of Elasticsearch should be deployed.
Also added a new repo for Elasticsearch ver. 5
Change-Id: Ifa2a0763ccc515f58173f42cba206da2cc55f3ba
diff --git a/elasticsearch/server/cluster.yml b/elasticsearch/server/cluster.yml
index 9be44ed..94b6d85 100644
--- a/elasticsearch/server/cluster.yml
+++ b/elasticsearch/server/cluster.yml
@@ -6,6 +6,7 @@
java_environment_version: "8"
java_environment_platform: openjdk
elasticsearch_cluster_name: elasticsearch
+ elasticsearch_version: 2
linux:
system:
sysctl:
@@ -16,6 +17,7 @@
headless: true
elasticsearch:
server:
+ version: ${_param:elasticsearch_version}
name: ${_param:elasticsearch_cluster_name}
enabled: true
master: true
diff --git a/elasticsearch/server/single.yml b/elasticsearch/server/single.yml
index 6606617..ce7da36 100644
--- a/elasticsearch/server/single.yml
+++ b/elasticsearch/server/single.yml
@@ -2,6 +2,8 @@
- service.java.environment.openjdk8
- service.elasticsearch.server.single
parameters:
+ _param:
+ elasticsearch_version: 2
linux:
system:
sysctl:
@@ -12,6 +14,7 @@
headless: true
elasticsearch:
server:
+ version: ${_param:elasticsearch_version}
enabled: true
bind:
address: ${_param:single_address}
diff --git a/linux/system/repo/elasticsearch5.yml b/linux/system/repo/elasticsearch5.yml
new file mode 100644
index 0000000..34699e8
--- /dev/null
+++ b/linux/system/repo/elasticsearch5.yml
@@ -0,0 +1,12 @@
+parameters:
+ linux:
+ system:
+ repo:
+ elasticsearch:
+ source: "deb https://artifacts.elastic.co/packages/5.x/apt stable main"
+ architectures: amd64
+ key_url: "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
+ elasticsearch_curator:
+ source: "deb http://packages.elastic.co/curator/4/debian stable main"
+ architectures: amd64
+ key_url: "https://packages.elastic.co/GPG-KEY-elasticsearch"
diff --git a/releasenotes/notes/elasticsearch-new-parameter-93a08f64ff1a22ab.yaml b/releasenotes/notes/elasticsearch-new-parameter-93a08f64ff1a22ab.yaml
new file mode 100644
index 0000000..00a44b2
--- /dev/null
+++ b/releasenotes/notes/elasticsearch-new-parameter-93a08f64ff1a22ab.yaml
@@ -0,0 +1,11 @@
+---
+summary: >
+ Added a new parameter for Elasticsearch
+features:
+ - Added the ``elasticsearch_version`` parameter to specify
+ which version of Elasticsearch should be deployed.
+ Elasticsearch version 2 is deployed by default.
+ To deploy Elasticsearch version 5, specify the
+ ``elasticsearch_version: 5`` parameter in the
+ ``classes/cluster/<cluster_name>/stacklight/server.yml``
+ file of the Reclass model.