From 77e516c260e6f36b88eb997b7937e65df1a303ef Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 4 Mar 2020 18:35:20 +0100 Subject: [PATCH 1/2] [7.6.1] bump version --- .kitchen.yml | 2 +- README.md | 10 +++++----- defaults/main.yml | 2 +- helpers/bumper.py | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index e7dcd4d0..28a6c3b1 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -19,7 +19,7 @@ provisioner: extra_vars: es_major_version: "<%= ENV['VERSION'] %>" <% if ENV['VERSION'] == '6.x' %> - es_version: '6.8.6' + es_version: '6.8.7' <% end %> <% end %> diff --git a/README.md b/README.md index dd2dbe6f..c6e42ef8 100644 --- a/README.md +++ b/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.0 +ansible-galaxy install elastic.elasticsearch,7.6.1 ``` 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.0 + es_version: 7.6.1 ``` -The above installs Elasticsearch 7.6.0 in a single node 'node1' on the hosts 'localhost'. +The above installs Elasticsearch 7.6.1 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.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 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.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. 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.0"). +* ```es_version``` (e.g. "7.6.1"). * ```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. diff --git a/defaults/main.yml b/defaults/main.yml index 99f6fc18..0a51b519 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,5 @@ --- -es_version: "7.6.0" +es_version: "7.6.1" es_use_snapshot_release: false es_enable_xpack: true es_package_name: "elasticsearch" diff --git a/helpers/bumper.py b/helpers/bumper.py index 2a056872..71d9a0ee 100755 --- a/helpers/bumper.py +++ b/helpers/bumper.py @@ -14,13 +14,13 @@ os.chdir(os.path.join(os.path.dirname(__file__), '..')) old_versions = { - 6: '6.8.5', - 7: '7.5.2', + 6: '6.8.6', + 7: '7.6.0', } new_versions = { - 6: '6.8.6', - 7: '7.6.0', + 6: '6.8.7', + 7: '7.6.1', } files = [ From 295657aef541135109060b9c5332755643abb410 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 4 Mar 2020 18:38:35 +0100 Subject: [PATCH 2/2] [7.6.1] update changelog --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52de4624..1b0e413d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## 7.6.1 - 2020/03/04 + +* 7.6.1 as default version + +| PR | Author | Title | +| ---------------------------------------------------------------- | ------------------------------------------------ | ---------------------------- | +|[#674](https://github.com/elastic/ansible-elasticsearch/pull/674) | [@HadrienPatte](https://github.com/HadrienPatte) | Fix typos in README | +|[#672](https://github.com/elastic/ansible-elasticsearch/pull/672) | [@pgassmann](https://github.com/pgassmann) | Fix check mode | +|[#676](https://github.com/elastic/ansible-elasticsearch/pull/676) | [@nduytg](https://github.com/nduytg) | Lint elasticsearch-xpack.yml | + + ## 7.6.0 - 2020/02/11 * 7.6.0 as default version