Merge remote-tracking branch 'upstream/master'

Author: Philipp Wiesner

.kitchen.yml

@@ -22,7 +22,7 @@ provisioner:
     extra_vars:
       es_major_version: "<%= ENV['VERSION'] %>"
       <% if ENV['VERSION'] == '6.x' %>
-      es_version: '6.8.16'
+      es_version: '6.8.17'
       <% end %>
   <% end %>
 

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 7.13.3
+
+* 7.13.3 as default version.
+* 6.8.17 as 6.x tested version
+
+
+| PR | Author | Title |
+| --- | --- | --- |
+| [#800](https://github.com/elastic/ansible-elasticsearch/pull/800) | [@chuckmilam](https://github.com/chuckmilam) | Minor correction for readability.  |
+
+
+## 7.13.2
+
+* 7.13.2 as default version.
+
+## 7.13.1
+
+* 7.13.1 as default version.
+
 ## 7.13.0
 
 * 7.13.0 as default version.

README.md

@@ -45,8 +45,7 @@ Ansible-elasticsearch 7.5.2 is updating the configuration files provided by this
 
 ### Removing OSS distribution for versions >= 7.11.0
 
-Starting from Elasticsearch 7.11.0, OSS distributions will no more provided following Elasticsearch
-recent license change.
+Starting from Elasticsearch 7.11.0, OSS distributions will no longer be provided following the recent Elasticsearch license change.
 
 This Ansible role will fail if `oss_version` is set to `true` and `es_version` is greater than 
 `7.11.0`.
@@ -70,7 +69,7 @@ This role uses the json_query filter which [requires jmespath](https://github.co
 Create your Ansible playbook with your own tasks, and include the role elasticsearch. You will have to have this repository accessible within the context of playbook.
 
 ```sh
-ansible-galaxy install elastic.elasticsearch,v7.13.0
+ansible-galaxy install elastic.elasticsearch,v7.13.3
 ```
 
 Then create your playbook yaml adding the role elasticsearch.
@@ -84,14 +83,14 @@ The simplest configuration therefore consists of:
   roles:
     - role: elastic.elasticsearch
   vars:
-    es_version: 7.13.0
+    es_version: 7.13.3
 ```
 
-The above installs Elasticsearch 7.13.0 in a single node 'node1' on the hosts 'localhost'.
+The above installs Elasticsearch 7.13.3 in a single node 'node1' on the hosts 'localhost'.
 
 **Note**:
 Elasticsearch default version is described in [`es_version`](https://github.com/elastic/ansible-elasticsearch/blob/master/defaults/main.yml#L2). You can override this variable in your playbook to install another version.
-While we are testing this role only with one 7.x and one 6.x version (respectively [7.13.0](https://github.com/elastic/ansible-elasticsearch/blob/master/defaults/main.yml#L2) and [6.8.16](https://github.com/elastic/ansible-elasticsearch/blob/master/.kitchen.yml#L22) at the time of writing), this role should work with other versions also in most cases.
+While we are testing this role only with one 7.x and one 6.x version (respectively [7.13.3](https://github.com/elastic/ansible-elasticsearch/blob/master/defaults/main.yml#L2) and [6.8.17](https://github.com/elastic/ansible-elasticsearch/blob/master/.kitchen.yml#L22) at the time of writing), this role should work with other versions also in most cases.
 
 This role also uses [Ansible tags](http://docs.ansible.com/ansible/playbooks_tags.html). Run your playbook with the `--list-tasks` flag for more information.
 
@@ -423,7 +422,7 @@ In addition to es_config, the following parameters allow the customization of th
 
 * ```oss_version```  Default `false`. Setting this to `true` will install the oss release of Elasticsearch (for version <7.11.0 only).
 * `es_xpack_trial` Default `false`. Setting this to `true` will start the 30-day trail once the cluster starts.
-* ```es_version``` (e.g. "7.13.0").
+* ```es_version``` (e.g. "7.13.3").
 * ```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,5 +1,5 @@
 ---
-es_version: "7.13.0"
+es_version: "7.13.3"
 es_use_snapshot_release: false
 oss_version: false
 es_package_name: "elasticsearch"