Merge pull request #673 from jmlrt/760-release

7.6.0 release

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 7.6.0 - 2020/02/11
+
+* 7.6.0 as default version
+
+| PR                                                               | Author                                                 | Title                                                 |
+| ---------------------------------------------------------------- | ------------------------------------------------------ | ----------------------------------------------------- |
+|[#667](https://github.com/elastic/ansible-elasticsearch/pull/667) | [@dependabot[bot]](https://github.com/apps/dependabot) | Bump rubyzip from 1.2.2 to 2.0.0                      |
+|[#671](https://github.com/elastic/ansible-elasticsearch/pull/671) | [@haslersn](https://github.com/haslersn)               | Remove whitespaces before newmines                    |
+|[#669](https://github.com/elastic/ansible-elasticsearch/pull/669) | [@rs-garrick](https://github.com/rs-garrick)           | Several tasks in elasticsearch-ssl.yml missing become |
+
+
 ## 7.5.2 - 2020/01/21
 
 * 7.5.2 as default version
@@ -8,7 +19,7 @@
 | ---------------------------------------------------------------- | -------------------------------------- | ---------------------------------------------------------------- |
 |[#648](https://github.com/elastic/ansible-elasticsearch/pull/648) | [@jmlrt](https://github.com/jmlrt)     | add proxy options to ES_JAVA_OPTS when defined with es_proxy_host|
 |[#657](https://github.com/elastic/ansible-elasticsearch/pull/657) | [@jakommo](https://github.com/jakommo) | switched relative URLs to absolute URLs                          |
-|[#664](https://github.com/elastic/ansible-elasticsearch/pull/664) | [@jmlrt](https://github.com/jmlrt)     | bump ruby to 2.5.7                                          |
+|[#664](https://github.com/elastic/ansible-elasticsearch/pull/664) | [@jmlrt](https://github.com/jmlrt)     | bump ruby to 2.5.7                                               |
 
 
 ## 7.5.1 - 2019/12/18

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.5.2
+ansible-galaxy install elastic.elasticsearch,7.6.0
 ```
 
 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.5.2
+    es_version: 7.6.0
 ```
 
-The above installs Elasticsearch 7.5.2 in a single node 'node1' on the hosts 'localhost'.
+The above installs Elasticsearch 7.6.0 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.5.2](https://github.com/elastic/ansible-elasticsearch/blob/master/defaults/main.yml#L2) and [6.8.6](https://github.com/elastic/ansible-elasticsearch/blob/master/.kitchen.yml#L22) at the time of writing), this role should work with others version also in most cases.
+While we are testing this role only with one 7.x and one 6.x version (respectively [7.6.0](https://github.com/elastic/ansible-elasticsearch/blob/master/defaults/main.yml#L2) and [6.8.6](https://github.com/elastic/ansible-elasticsearch/blob/master/.kitchen.yml#L22) at the time of writing), this role should work with others version 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.5.2").
+* ```es_version``` (e.g. "7.6.0").
 * ```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.5.2"
+es_version: "7.6.0"
 es_use_snapshot_release: false
 es_enable_xpack: true
 es_package_name: "elasticsearch"

helpers/bumper.py

@@ -15,12 +15,12 @@ os.chdir(os.path.join(os.path.dirname(__file__), '..'))
 
 old_versions = {
     6: '6.8.5',
-    7: '7.5.1',
+    7: '7.5.2',
 }
 
 new_versions = {
     6: '6.8.6',
-    7: '7.5.2',
+    7: '7.6.0',
 }
 
 files = [