Support Elasticsearch 2.x.

README.md

@@ -38,17 +38,28 @@ elasticsearch_cluster_name = elasticsearch1-somedc-prod
 # to false, we will use unicast discovery
 # instead (as in, we will add all nodes)
 # to configuration instead of relying on multicasting
-#
-elasticsearch_autodiscovery = true
+# For production, set to false.
+# Default: false.
+elasticsearch_autodiscovery = false
+
+# Default multicast port
+elasticsearch_autodiscovery_port = 54328
 
 # ElasticSearch heap size (default: 256m)
 # http://www.elasticsearch.org/guide/en/elasticsearch/guide/current/heap-sizing.html
 elasticsearch_heap_size = 1g
 
 # Version of ElasticDump to install
 elasticdump_version = v0.12.0
+
+# Default Elasticsearch version.
+# Note: Ensure the meta/main.yml file uses the corresponding repository. (e.g. `elasticsearch-2.x`, `elasticsearch-1.7`, etc.)
+# See https://github.com/AerisCloud/ansible-repos for corresponding repositories.
+elasticsearch_version = 2.1.1
 ```
 
+
+
 ### Execution
 
 You will need to run this on the whole cluster every time you

defaults/main.yml

@@ -1,6 +1,6 @@
 elasticsearch_tcp_port: 19350
 elasticsearch_http_port: 9200
-elasticsearch_autodiscovery: true
+elasticsearch_autodiscovery: false
 elasticsearch_heap_size: 256m
 
 elasticdump_version: v0.12.0

meta/main.yml

@@ -12,6 +12,7 @@ galaxy_info:
     - name: Debian
       versions:
         - wheezy
+        - jessie
   categories:
     - database
     - database:nosql
@@ -21,7 +22,12 @@ dependencies:
   - role: aeriscloud.repos
     repositories:
       centos6:
-        - elasticsearch
+        - elasticsearch-2.x
       centos7:
-        - elasticsearch
+        - elasticsearch-2.x
+      wheezy:
+        - elasticsearch-2.x
+      jessie:
+        - backports
+        - elasticsearch-2.x
   - role: aeriscloud.yum

tasks/debian.yml

@@ -46,7 +46,7 @@
 - name: "Install Elasticsearch"
   apt: >
     update_cache=yes
-    name=elasticsearch
+    name=elasticsearch={{ elasticsearch_version }}
   register: elasticsearch_installed
   notify:
     - Restart ElasticSearch

tasks/main.yml

@@ -17,16 +17,30 @@
     chdir=/usr/share/elasticsearch
     creates=/usr/share/elasticsearch/plugins/{{ item.dest }}
     
-    bin/plugin -install {{ item.src }}
+    bin/plugin install {{ item.src }}
   with_items:
     - src: royrusso/elasticsearch-HQ
-      dest: HQ
+      dest: hq
     - src: mobz/elasticsearch-head
       dest: head
   tags:
     - elasticsearch
     - plugins
 
+- name: "Install ElasticSearch plugins"
+  shell: |
+    chdir=/usr/share/elasticsearch
+    creates=/usr/share/elasticsearch/plugins/{{ item.dest }}
+    
+    bin/plugin install {{ item.src }}
+  with_items:
+    - src: discovery-multicast
+      dest: discovery-multicast
+  when: elasticsearch_autodiscovery|string == "True"
+  tags:
+    - elasticsearch
+    - plugins
+
 - name: "Setup ElasticSearch configuration"
   template: >
     src=elasticsearch.yml

templates/elasticsearch.yml

@@ -15,8 +15,12 @@ http.enabled: true
 
 # adapt these for discovery to work in your network! multicast can be tricky
 {% if elasticsearch_autodiscovery|string == "True" %}
+transport.publish_port: {{ elasticsearch_tcp_port }}
 discovery.zen.ping.multicast.address: {{ ansible_ssh_host }}
 discovery.zen.ping.multicast.group: 224.2.2.4
+discovery.zen.ping.multicast.enabled: true
+discovery.zen.ping.multicast.port: {{ elasticsearch_autodiscovery_port|default(54328) }}
+discovery.zen.ping.multicast.ttl: {{ elasticsearch_autodiscovery_ttl|default(3) }}
 {% else %}
 discovery.zen.ping.multicast.enabled: false
 discovery.zen.ping.unicast.hosts:

vars/main.yml

@@ -1,3 +1,3 @@
-elasticsearch_version: "1.5.2"
-
-elasticsearch_node_version: "v0.10.38"
+elasticsearch_version: "2.1.1"
+elasticsearch_repo: "2.x"
+elasticsearch_node_version: "v0.10.40"