diff --git a/.kitchen.yml b/.kitchen.yml index 2fd5481..6c4c9f3 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.10' + es_version: '6.8.11' <% end %> <% end %> diff --git a/CHANGELOG.md b/CHANGELOG.md index f856d9e..fa0aeca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## 7.8.1 - 2020/07/28 + +* 7.8.1 as default version +* 6.8.11 as 6.x tested version + +| PR | Author | Title | +|-------------------------------------------------------------------|----------------------------------------|------------------------------------------| +| [#701](https://github.com/elastic/ansible-elasticsearch/pull/701) | [@suramon](https://github.com/suramon) | Fix running ansible in check mode | +| [#703](https://github.com/elastic/ansible-elasticsearch/pull/703) | [@anisf](https://github.com/anisf) | Add amazonlinux2 support | +| [#705](https://github.com/elastic/ansible-elasticsearch/pull/705) | [@andzs](https://github.com/andzs) | Use sudo for users migration from <6.3.0 | + + ## 7.8.0 - 2020/06/18 * 7.8.0 as default version diff --git a/README.md b/README.md index af6d9d0..eef1470 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,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.8.0 +ansible-galaxy install elastic.elasticsearch,7.8.1 ``` Then create your playbook yaml adding the role elasticsearch. @@ -71,14 +71,14 @@ The simplest configuration therefore consists of: roles: - role: elastic.elasticsearch vars: - es_version: 7.8.0 + es_version: 7.8.1 ``` -The above installs Elasticsearch 7.8.0 in a single node 'node1' on the hosts 'localhost'. +The above installs Elasticsearch 7.8.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.8.0](https://github.com/elastic/ansible-elasticsearch/blob/master/defaults/main.yml#L2) and [6.8.10](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.8.1](https://github.com/elastic/ansible-elasticsearch/blob/master/defaults/main.yml#L2) and [6.8.11](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. @@ -399,7 +399,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 * `es_xpack_trial` Default `false`. Setting this to `true` will start the 30-day trail once the cluster starts. -* ```es_version``` (e.g. "7.8.0"). +* ```es_version``` (e.g. "7.8.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 ee77cd8..ed2d378 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,5 @@ --- -es_version: "7.8.0" +es_version: "7.8.1" es_use_snapshot_release: false oss_version: false es_package_name: "elasticsearch" diff --git a/helpers/bumper.py b/helpers/bumper.py index dc9b045..37c2f39 100755 --- a/helpers/bumper.py +++ b/helpers/bumper.py @@ -14,13 +14,13 @@ Usage: os.chdir(os.path.join(os.path.dirname(__file__), '..')) old_versions = { - 6: '6.8.9', - 7: '7.7.1', + 6: '6.8.10', + 7: '7.8.0', } new_versions = { - 6: '6.8.10', - 7: '7.8.0', + 6: '6.8.11', + 7: '7.8.1', } files = [