diff --git a/.kitchen.yml b/.kitchen.yml index 8a11f20..2ce47bd 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.4' + es_version: '6.8.5' <% end %> <% end %> diff --git a/README.md b/README.md index fb020e3..da29fe3 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,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.4.1 +ansible-galaxy install elastic.elasticsearch,7.4.2 ``` Then create your playbook yaml adding the role elasticsearch. @@ -46,14 +46,14 @@ The simplest configuration therefore consists of: roles: - role: elastic.elasticsearch vars: - es_version: 7.4.1 + es_version: 7.4.2 ``` -The above installs Elasticsearch 7.4.1 in a single node 'node1' on the hosts 'localhost'. +The above installs Elasticsearch 7.4.2 in a single node 'node1' on the hosts 'localhost'. **Note**: Elasticsearch default version is described in [`es_version`](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.4.1](defaults/main.yml#L2) and [6.8.4](.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.4.2](defaults/main.yml#L2) and [6.8.5](.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. @@ -381,7 +381,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.4.1"). +* ```es_version``` (e.g. "7.4.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. diff --git a/defaults/main.yml b/defaults/main.yml index 08a0e75..019b13f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,5 @@ --- -es_version: "7.4.1" +es_version: "7.4.2" es_use_snapshot_release: false es_enable_xpack: true es_package_name: "elasticsearch" diff --git a/helpers/bumper.py b/helpers/bumper.py index 384d34b..2d8cd43 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.3', - 7: '7.4.0', + 6: '6.8.4', + 7: '7.4.1', } new_versions = { - 6: '6.8.4', - 7: '7.4.1', + 6: '6.8.5', + 7: '7.4.2', } files = [