santerikainulainen/ansible-role-elasticsearch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into AddSSLSupport

Browse source
This commit is contained in:
pemontto 2019-10-25 11:14:00 +01:00
commit 43f7421d72
No known key found for this signature in database
GPG key ID: EDCB93C3DA1B5DA9
4 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.kitchen.yml
View file

@ -19,7 +19,7 @@ provisioner:
extra_vars:
es_major_version: "<%= ENV['VERSION'] %>"
<% if ENV['VERSION'] == '6.x' %>
es_version: '6.8.1'
es_version: '6.8.4'
<% end %>
<% end %>

23
CHANGELOG.md
View file

@ -1,5 +1,17 @@
# Changelog
## 7.4.1 - 2019/10/23
* 7.4.1 as default version
* 6.8.4 as 6.x tested version
| PR | Author | Title |
| ---------------------------------------------------------------- | ---------------------------------- | -------------------------------------------------- |
|[#617](https://github.com/elastic/ansible-elasticsearch/pull/617) | [@jmlrt](https://github.com/jmlrt) | Use systemd ansible module for daemon-reload |
|[#618](https://github.com/elastic/ansible-elasticsearch/pull/618) | [@jmlrt](https://github.com/jmlrt) | Fix probot newlines |
|[#619](https://github.com/elastic/ansible-elasticsearch/pull/619) | [@jmlrt](https://github.com/jmlrt) | Fix python AttributeError + format code with black |
## 7.4.0 - 2019/10/01
* 7.4.0 as default version
@ -22,6 +34,7 @@
|[#609](https://github.com/elastic/ansible-elasticsearch/pull/609) | [@jmlrt](https://github.com/jmlrt) | No more 6.3 compatibility + Use default files permissions from Elasticsearch package|
|[#510](https://github.com/elastic/ansible-elasticsearch/pull/510) | [@verboEse](https://github.com/verboEse) | Don't fetch APT key if existent|
## 7.1.1 - 2019/06/04
### Breaking changes
@ -59,6 +72,7 @@ You can now using basic authentication by overriding `es_api_basic_auth_username
* [#557](https://github.com/elastic/ansible-elasticsearch/pull/557) - @jmlrt - Bump gem dependencies to fix [CVE-2018-1000544](https://nvd.nist.gov/vuln/detail/CVE-2018-1000544) and [CVE-2018-1000201](https://nvd.nist.gov/vuln/detail/CVE-2018-1000201)
* [#564](https://github.com/elastic/ansible-elasticsearch/pull/564) - @jmlrt - Bump all gem dependencies to fix kitchen tests
## 6.6.0 - 2019/01/29
### Features
@ -75,12 +89,14 @@ You can now using basic authentication by overriding `es_api_basic_auth_username
* [#526](https://github.com/elastic/ansible-elasticsearch/pull/526) - @Fra-nk - Allow not installing Elasticsearch deb repository key
* [#527](https://github.com/elastic/ansible-elasticsearch/pull/527) - @katsukamaru - Execute java version check in check mode
## 6.5.1.1 - 2018/11/27
### Fixes
* [#516](https://github.com/elastic/ansible-elasticsearch/pull/516) - @Crazybus - Only attempt to copy the old users file if it actually exists
## 6.5.1 - 2018/11/26
### Features
@ -95,6 +111,7 @@ You can now using basic authentication by overriding `es_api_basic_auth_username
* [#504](https://github.com/elastic/ansible-elasticsearch/pull/504) - @victorgs - Using tests as filters is deprecated
* [#493](https://github.com/elastic/ansible-elasticsearch/pull/493) - @Crazybus - Only use the first found java version if there are multiple installed
## 6.4.0 - 2018/08/24
### Features
@ -113,6 +130,7 @@ You can now using basic authentication by overriding `es_api_basic_auth_username
* 6.3.1 as default Elasticsearch version
## 6.3.0.1 - 2018/06/28
### Fixes
@ -151,6 +169,7 @@ When upgrading from module versions prior to 6.3, there are a number of upgrade
* [#455](https://github.com/elastic/ansible-elasticsearch/pull/455) - @Crazybus - Add automated test for upgrading from oss to oss
* [#457](https://github.com/elastic/ansible-elasticsearch/pull/457) - @Crazybus - Refactor integration tests to remove duplication and add extra suites to make sure all upgrade paths are covered
## 6.2.4.1 - 2018/06/14
Patch release requested by @average-joe in #453
@ -167,17 +186,20 @@ Patch release requested by @average-joe in #453
* `6.2.4` and `5.6.9` as the default versions.
## 6.2.3 - 2018/04/21
* Thanks to @cl0udf0x for adding proper names to all tasks which were unnamed [#417](https://github.com/elastic/ansible-elasticsearch/pull/417)
* Thanks @cyrilleverrier for having a keen eye and spotting this typo. [#432](https://github.com/elastic/ansible-elasticsearch/pull/432)
## 6.2.2 - 2018/02/22
* `6.2.2` and `5.6.8` as the default versions
* Thanks to @pemontto for fixing up all of the ansible conditional logic https://github.com/elastic/ansible-elasticsearch/pull/429
* Thanks @cyrilleverrier for https://github.com/elastic/ansible-elasticsearch/pull/427 which makes sure x-pack settings are not in the config file when x-pack isn't enabled
## 6.1.3 - 2018/02/01
* `6.x` is now the default `es_major_version` with `6.1.3` as the default `es_version`
@ -185,6 +207,7 @@ Patch release requested by @average-joe in #453
* `.kitchen.yml` has been updated to allow testing both `6.x` and `5.x` versions
* A new [Jenkins job](https://devops-ci.elastic.co/job/elastic+ansible-elasticsearch+pull-request/) has been added for pull requests to automatically test all combinations of `6.x` and `5.x` on ubuntu-1404, ubuntu-1604, debian-8 and centos-7 with the various test suites.
## 5.5.1 - 2017/08/20
* Fixes with respect to issues on restart.

10
README.md
View file

@ -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.0
ansible-galaxy install elastic.elasticsearch,7.4.1
```
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.0
es_version: 7.4.1
```
The above installs Elasticsearch 7.4.0 in a single node 'node1' on the hosts 'localhost'.
The above installs Elasticsearch 7.4.1 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.0](defaults/main.yml#L2) and [6.8.1](.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.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.
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.
@ -450,7 +450,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.0").
* ```es_version``` (e.g. "7.4.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.

2
defaults/main.yml
View file

@ -1,5 +1,5 @@
---
es_version: "7.4.0"
es_version: "7.4.1"
es_use_snapshot_release: false
es_enable_xpack: true
es_package_name: "elasticsearch"