Merge pull request #686 from jmlrt/762-release

7.6.2 release

.kitchen.yml

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

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 7.6.2 - 2020/03/31
+
+* 7.6.2 as default version
+* 6.8.8 as 6.x tested version
+
+| PR                                                               | Author                               | Title                                                          |
+| ---------------------------------------------------------------- | ------------------------------------ | -------------------------------------------------------------- |
+|[#678](https://github.com/elastic/ansible-elasticsearch/pull/678) | [@nduytg](https://github.com/nduytg) | Update security task files                                     |
+|[#681](https://github.com/elastic/ansible-elasticsearch/pull/681) | [@timdev](https://github.com/timdev) | Introduce `es_java_home` variable to allow setting `JAVA_HOME` |
+|[#682](https://github.com/elastic/ansible-elasticsearch/pull/682) | [@jmlrt](https://github.com/jmlrt)   | Export `VERSION` variable to make subshell                     |
+
 ## 7.6.1 - 2020/03/04
 
 * 7.6.1 as default version

README.md

@@ -55,7 +55,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,7.6.1
+ansible-galaxy install elastic.elasticsearch,7.6.2
 ```
 
 Then create your playbook yaml adding the role elasticsearch.
@@ -69,14 +69,14 @@ The simplest configuration therefore consists of:
   roles:
     - role: elastic.elasticsearch
   vars:
-    es_version: 7.6.1
+    es_version: 7.6.2
 ```
 
-The above installs Elasticsearch 7.6.1 in a single node 'node1' on the hosts 'localhost'.
+The above installs Elasticsearch 7.6.2 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.6.1](https://github.com/elastic/ansible-elasticsearch/blob/master/defaults/main.yml#L2) and [6.8.7](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.6.2](https://github.com/elastic/ansible-elasticsearch/blob/master/defaults/main.yml#L2) and [6.8.8](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.
 
@@ -402,7 +402,7 @@ In addition to es_config, the following parameters allow the customization of th
 
 * ```es_enable_xpack```  Default `true`. Setting this to `false` will install the oss release of elasticsearch
 * `es_xpack_trial` Default `false`. Setting this to `true` will start the 30-day trail once the cluster starts.
-* ```es_version``` (e.g. "7.6.1").
+* ```es_version``` (e.g. "7.6.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,5 +1,5 @@
 ---
-es_version: "7.6.1"
+es_version: "7.6.2"
 es_use_snapshot_release: false
 es_enable_xpack: true
 es_package_name: "elasticsearch"

helpers/bumper.py

@@ -14,13 +14,13 @@ Usage:
 os.chdir(os.path.join(os.path.dirname(__file__), '..'))
 
 old_versions = {
-    6: '6.8.6',
-    7: '7.6.0',
+    6: '6.8.7',
+    7: '7.6.1',
 }
 
 new_versions = {
-    6: '6.8.7',
-    7: '7.6.1',
+    6: '6.8.8',
+    7: '7.6.2',
 }
 
 files = [