Merge pull request #414 from elastic/v6_as_the_default

Make 6.x the default version

.kitchen.yml

@@ -20,8 +20,8 @@ provisioner:
   attributes:
     extra_vars:
       es_major_version: "<%= ENV['VERSION'] %>"
-      <% if ENV['VERSION'] == '6.x' %>
-      es_version: '6.1.2'
+      <% if ENV['VERSION'] == '5.x' %>
+      es_version: '5.6.7'
       <% end %>
   <% end %>
 

README.md

@@ -3,7 +3,7 @@
 
 **THIS ROLE IS FOR 6.x, 5.x. FOR 2.x SUPPORT PLEASE USE THE 2.x BRANCH.**
 
-Ansible role for 5.x Elasticsearch.  Currently this works on Debian and RedHat based linux systems.  Tested platforms are:
+Ansible role for 6.x/5.x Elasticsearch.  Currently this works on Debian and RedHat based linux systems.  Tested platforms are:
 
 * Ubuntu 14.04/16.04
 * Debian 8
@@ -330,7 +330,7 @@ These can either be set to a user declared in the file based realm, with admin p
 In addition to es_config, the following parameters allow the customization of the Java and Elasticsearch versions as well as the role behaviour. Options include:
 
 * ```es_major_version```  Should be consistent with es_version. For versions >= 5.0 and < 6.0 this must be "5.x". For versions >= 6.0 this must be "6.x".
-* ```es_version``` (e.g. "5.1.2").  
+* ```es_version``` (e.g. "6.1.2").
 * ```es_api_host``` The host name used for actions requiring HTTP e.g. installing templates. Defaults to "localhost".
 * ```es_api_port``` The port used for actions requiring HTTP e.g. installing templates. Defaults to 9200. **CHANGE IF THE HTTP PORT IS NOT 9200**
 * ```es_api_basic_auth_username``` The Elasticsearch username for making admin changing actions. Used if Security is enabled. Ensure this user is admin.

defaults/main.yml

@@ -1,6 +1,6 @@
 ---
-es_major_version: "5.x"
-es_version: "5.5.1"
+es_major_version: "6.x"
+es_version: "6.1.3"
 es_version_lock: false
 es_use_repository: true
 es_templates_fileglob: "files/templates/*.json"