Merge branch 'main' into rolemappings

Author: gaima8

.kitchen.yml

@@ -22,13 +22,10 @@ provisioner:
     extra_vars:
       es_major_version: "<%= ENV['VERSION'] %>"
       <% if ENV['VERSION'] == '6.x' %>
-      es_version: '6.8.18'
+      es_version: '6.8.23'
       <% end %>
   <% end %>
 
-transport:
-  max_ssh_sessions: 6
-
 platforms:
   - name: ubuntu-14.04
     driver_config:

CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## 7.16.3
+
+* 7.16.3 as default version.
+* 6.8.23 as 6.x tested version
+
+## 7.16.2
+
+* 7.16.2 as default version.
+* 6.8.22 as 6.x tested version
+
+## 7.16.1
+
+* 7.16.1 as default version.
+* 6.8.21 as 6.x tested version
+
+
+| PR | Author | Title |
+| --- | --- | --- |
+| [#838](https://github.com/elastic/ansible-elasticsearch/pull/838) | [@mgreau](https://github.com/mgreau) | Add warning message about 8.x versions  |
+| [#830](https://github.com/elastic/ansible-elasticsearch/pull/830) | [@bfontaine](https://github.com/bfontaine) | README: fix link to ES licensing change blog post  |
+| [#831](https://github.com/elastic/ansible-elasticsearch/pull/831) | [@gaima8](https://github.com/gaima8) | command necessarily causes a change on each invocation breaking idempotency, wait_for accomplishes the same goal without the change  |
+| [#833](https://github.com/elastic/ansible-elasticsearch/pull/833) | [@Pablohn26](https://github.com/Pablohn26) | Fix broken link  |
+
+
+## 7.16.0
+
+* 7.16.0 as default version.
+
+
+| PR | Author | Title |
+| --- | --- | --- |
+| [#835](https://github.com/elastic/ansible-elasticsearch/pull/835) | [@jmlrt](https://github.com/jmlrt) | Remove Ubuntu 14.04 support  |
+| [#825](https://github.com/elastic/ansible-elasticsearch/pull/825) | [@darxriggs](https://github.com/darxriggs) | Remove duplicate entry from YAML  |
+| [#828](https://github.com/elastic/ansible-elasticsearch/pull/828) | [@ygel](https://github.com/ygel) | Rename master - main  |
+
+
 ## 7.15.1
 
 * 7.15.1 as default version.

README.md

@@ -2,11 +2,12 @@
 [![Build Status](https://img.shields.io/jenkins/s/https/devops-ci.elastic.co/job/elastic+ansible-elasticsearch+main.svg)](https://devops-ci.elastic.co/job/elastic+ansible-elasticsearch+main/)
 [![Ansible Galaxy](https://img.shields.io/badge/ansible--galaxy-elastic.elasticsearch-blue.svg)](https://galaxy.ansible.com/elastic/elasticsearch/)
 
+⚠️ **This Ansible role is being deprecated and will not be updated to support Elasticsearch 8.0.0 and the following versions.**
+
 **THIS ROLE IS FOR 7.x & 6.x**
 
 Ansible role for 7.x/6.x Elasticsearch.  Currently this works on Debian and RedHat based linux systems. Tested platforms are:
 
-* Ubuntu 14.04
 * Ubuntu 16.04
 * Ubuntu 18.04
 * Ubuntu 20.04
@@ -50,7 +51,7 @@ Starting from Elasticsearch 7.11.0, OSS distributions will no longer be provided
 This Ansible role will fail if `oss_version` is set to `true` and `es_version` is greater than 
 `7.11.0`.
 
-See [Doubling down on open, Part II](https://www.elastic.co/blog/licensing-change for more details)
+See [Doubling down on open, Part II](https://www.elastic.co/blog/licensing-change)
 blog post for more details.
 
 #### How to override configuration files provided by ansible-elasticsearch?
@@ -69,7 +70,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,v7.15.1
+ansible-galaxy install elastic.elasticsearch,v7.16.3
 ```
 
 Then create your playbook yaml adding the role elasticsearch.
@@ -83,16 +84,16 @@ The simplest configuration therefore consists of:
   roles:
     - role: elastic.elasticsearch
   vars:
-    es_version: 7.15.1
+    es_version: 7.16.3
 ```
 
-The above installs Elasticsearch 7.15.1 in a single node 'node1' on the hosts 'localhost'.
+The above installs Elasticsearch 7.16.3 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/main/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.15.1](https://github.com/elastic/ansible-elasticsearch/blob/main/defaults/main.yml#L2) and [6.8.18](https://github.com/elastic/ansible-elasticsearch/blob/main/.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.16.3](https://github.com/elastic/ansible-elasticsearch/blob/main/defaults/main.yml#L2) and [6.8.23](https://github.com/elastic/ansible-elasticsearch/blob/main/.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.
+This role also uses [Ansible tags](https://docs.ansible.com/ansible/2.9/user_guide/playbooks_tags.html). Run your playbook with the `--list-tasks` flag for more information.
 
 ## Testing
 
@@ -449,7 +450,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 (for version <7.11.0 only).
 * `es_xpack_trial` Default `false`. Setting this to `true` will start the 30-day trail once the cluster starts.
-* ```es_version``` (e.g. "7.15.1").
+* ```es_version``` (e.g. "7.16.3").
 * ```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.

defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-es_version: "7.15.1"
+es_version: "7.16.3"
 es_use_snapshot_release: false
 oss_version: false
 es_package_name: "elasticsearch"

tasks/main.yml

@@ -83,7 +83,8 @@
 
 # If playbook runs too fast, Native commands could fail as the Native Realm is not yet up
 - name: Wait {{ es_api_sleep }} seconds for the Native Realm to come up
-  command: "sleep {{ es_api_sleep }}"
+  wait_for:
+    timeout: "{{ es_api_sleep }}"
   when: manage_native_realm | bool
 
 - name: activate-license

test/matrix-6x.yml

@@ -1,5 +1,4 @@
 OS:
-  - ubuntu-1404
   - ubuntu-1604
   - ubuntu-1804
   - ubuntu-2004

test/matrix.yml

@@ -1,5 +1,4 @@
 OS:
-  - ubuntu-1404
   - ubuntu-1604
   - ubuntu-1804
   - ubuntu-2004