Skip to content

Commit 25bd09f

Browse files
authored
Small fixes and improvements (elastic#569)
- add .ruby-version - update ansible min version - update ansible galaxy tags - fix doc and changelog
1 parent 7f5be96 commit 25bd09f

File tree

4 files changed

+18
-15
lines changed

4 files changed

+18
-15
lines changed

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.3.0

CHANGELOG.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
* [#513](https://github.com/elastic/ansible-elasticsearch/pull/513) - @kakoni - Fix typo in elasticsearch-parameters.yml
1313
* [#522](https://github.com/elastic/ansible-elasticsearch/pull/522) - @SlothOfAnarchy - Fix package download URL
14-
* [#526](https://github.com/elastic/ansible-elasticsearch/pull/527) - @Fra-nk - Allow not installing Elasticsearch deb repository key
14+
* [#526](https://github.com/elastic/ansible-elasticsearch/pull/526) - @Fra-nk - Allow not installing Elasticsearch deb repository key
1515
* [#527](https://github.com/elastic/ansible-elasticsearch/pull/527) - @katsukamaru - Execute java version check in check mode
1616

1717
## 6.5.1.1 - 2018/11/27
@@ -30,7 +30,7 @@
3030

3131
* [#487](https://github.com/elastic/ansible-elasticsearch/pull/487) - @lazouz - Disable check mode to make install plugins idempotent
3232
* [#501](https://github.com/elastic/ansible-elasticsearch/pull/501) - @kaxil - Make the order of configs consistent for comparing
33-
* [#497](https://github.com/elastic/ansible-elasticsearch/pull/497) - @Crazybus - Document es_use_repository and es_custom_package_url
33+
* [#497](https://github.com/elastic/ansible-elasticsearch/pull/497) - @Crazybus - Document es_use_repository and es_custom_package_url
3434
* [#504](https://github.com/elastic/ansible-elasticsearch/pull/504) - @victorgs - Using tests as filters is deprecated
3535
* [#493](https://github.com/elastic/ansible-elasticsearch/pull/493) - @Crazybus - Only use the first found java version if there are multiple installed
3636

@@ -72,7 +72,7 @@ When upgrading from module versions prior to 6.3, there are a number of upgrade
7272
* oss to oss
7373
* oss to xpack
7474
* xpack to xpack
75-
* X-Pack configuration files which used to be in `${ES_PATH_CONF}/x-pack` are now in `${ES_PATH_CONF}/`. If you have any configuration files in this directory not managed by ansible you will need to move them manually.
75+
* X-Pack configuration files which used to be in `${ES_PATH_CONF}/x-pack` are now in `${ES_PATH_CONF}/`. If you have any configuration files in this directory not managed by ansible you will need to move them manually.
7676

7777
#### Features
7878

@@ -92,14 +92,14 @@ When upgrading from module versions prior to 6.3, there are a number of upgrade
9292

9393
## 6.2.4.1 - 2018/06/14
9494

95-
Patch release requested by @average-joe in #453
95+
Patch release requested by @average-joe in #453
9696

9797
#### Pull requests
9898

99-
* [#445](https://github.com/elastic/ansible-elasticsearch/pull/445) - @gekkeharry13 - Added configuration options for configuring x-pack notifications via email with some other nice fixes.
99+
* [#445](https://github.com/elastic/ansible-elasticsearch/pull/445) - @gekkeharry13 - Added configuration options for configuring x-pack notifications via email with some other nice fixes.
100100
* [#450](https://github.com/elastic/ansible-elasticsearch/pull/450) - @Crazybus - improving some flakey tests which were randomly failing.
101101
* [#447](https://github.com/elastic/ansible-elasticsearch/pull/447) - @chaintng - Fix to make sure sudo is used when running `update-alternatives` for java.
102-
* [#423](https://github.com/elastic/ansible-elasticsearch/pull/423) - @eRadical - Fixing the until condition being used when installing rpms from a custom repository.
102+
* [#423](https://github.com/elastic/ansible-elasticsearch/pull/423) - @eRadical - Fixing the until condition being used when installing rpms from a custom repository.
103103

104104

105105
## 6.2.4 - 2018/04/24
@@ -120,9 +120,9 @@ Patch release requested by @average-joe in #453
120120
## 6.1.3 - 2018/02/01
121121

122122
* `6.x` is now the default `es_major_version` with `6.1.3` as the default `es_version`
123-
* Special thanks to @shribigb, @toddlers and @remil1000 for their efforts in getting `6.x` support working!
123+
* Special thanks to @shribigb, @toddlers and @remil1000 for their efforts in getting `6.x` support working!
124124
* `.kitchen.yml` has been updated to allow testing both `6.x` and `5.x` versions
125-
* 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.
125+
* 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.
126126

127127
## 5.5.1 - 2017/08/20
128128

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ Ansible role for 7.x/6.x Elasticsearch. Currently this works on Debian and RedH
1313
* Debian 9
1414
* CentOS 7
1515

16-
The latest Elasticsearch versions of 7.x & 6.x are actively tested. **Only Ansible versions > 2.4.3.0 are supported, as this is currently the only version tested.**
16+
The latest Elasticsearch versions of 7.x & 6.x are actively tested.
1717

18-
##### Dependency
18+
## Dependency
1919
This role uses the json_query filter which [requires jmespath](https://github.com/ansible/ansible/issues/24319) on the local machine.
2020

2121
## Usage
2222

2323
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.
2424

2525
```sh
26-
ansible-galaxy install elastic.elasticsearch,7.0.1
26+
ansible-galaxy install git+https://github.com/elastic/ansible-elasticsearch.git,7f5be969e07173c5697432141e909b6ced5a2e94
2727
```
2828

2929
Then create your playbook yaml adding the role elasticsearch. By default, the user is only required to specify a unique es_instance_name per role application. This should be unique per node.

meta/main.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ galaxy_info:
77
description: Elasticsearch for Linux
88
company: "Elastic.co"
99
license: "license (Apache)"
10-
min_ansible_version: 2.3.2
10+
min_ansible_version: 2.4.2
1111
platforms:
1212
- name: EL
1313
versions:
@@ -19,7 +19,9 @@ galaxy_info:
1919
- name: Ubuntu
2020
versions:
2121
- all
22-
categories:
23-
- system
24-
22+
- galaxy_tags:
23+
- elastic
24+
- elasticsearch
25+
- elk
26+
- logging
2527
dependencies: []

0 commit comments

Comments
 (0)