diff --git a/CHANGELOG.md b/CHANGELOG.md index 65da3f1..981d3c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 7.9.2 - 2020/09/24 + +* 7.9.2 as default version + +| PR | Author | Title | +|-------------------------------------------------------------------|----------------------------------------|------------------------------------------| +| [#716](https://github.com/elastic/ansible-elasticsearch/pull/716) | [@lksnyder0](https://github.com/lksnyder0) | Use run_once for api related tasks | + ## 7.9.1 - 2020/09/03 * 7.9.1 as default version diff --git a/README.md b/README.md index 9336fb3..8a5886e 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.9.1 +ansible-galaxy install elastic.elasticsearch,7.9.2 ``` 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.9.1 + es_version: 7.9.2 ``` -The above installs Elasticsearch 7.9.1 in a single node 'node1' on the hosts 'localhost'. +The above installs Elasticsearch 7.9.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.9.1](https://github.com/elastic/ansible-elasticsearch/blob/master/defaults/main.yml#L2) and [6.8.12](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.9.2](https://github.com/elastic/ansible-elasticsearch/blob/master/defaults/main.yml#L2) and [6.8.12](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.9.1"). +* ```es_version``` (e.g. "7.9.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 b519ab0..6d6f6f7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,5 @@ --- -es_version: "7.9.1" +es_version: "7.9.2" es_use_snapshot_release: false oss_version: false es_package_name: "elasticsearch" diff --git a/helpers/bumper.py b/helpers/bumper.py index 956b835..3e32420 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.11', - 7: '7.9.0', + 6: '6.8.12', + 7: '7.9.1', } new_versions = { 6: '6.8.12', - 7: '7.9.1', + 7: '7.9.2', } files = [ diff --git a/test/integration/files/custom_config/jvm.options b/test/integration/files/custom_config/jvm.options index 71ce100..2c6049e 100644 --- a/test/integration/files/custom_config/jvm.options +++ b/test/integration/files/custom_config/jvm.options @@ -2,9 +2,6 @@ -Xms2g -Xmx2g --XX:+UseConcMarkSweepGC --XX:CMSInitiatingOccupancyFraction=75 --XX:+UseCMSInitiatingOccupancyOnly -Des.networkaddress.cache.ttl=60 -Des.networkaddress.cache.negative.ttl=10 -XX:+AlwaysPreTouch