From 9539712bd778ce3a6c5e3f35c1bdd8277faae2d6 Mon Sep 17 00:00:00 2001 From: anisf Date: Fri, 26 Jun 2020 09:42:23 +0200 Subject: [PATCH] add AMZN Linux 2 support (#703) --- .kitchen.yml | 12 ++++++++++++ README.md | 1 + tasks/elasticsearch-parameters.yml | 2 +- test/matrix.yml | 1 + 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.kitchen.yml b/.kitchen.yml index 43fae02..2fd5481 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -120,6 +120,18 @@ platforms: run_command: "/usr/sbin/init" privileged: true use_sudo: false + - name: amazonlinux-2 + driver_config: + image: amazonlinux:2 + provision_command: + - yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + - yum -y install ansible iproute python2-jmespath + volume: + - <%=ENV['ES_XPACK_LICENSE_FILE']%>:/tmp/license.json + - /etc # This fixes certain java file actions that check the mount point. Without this adding users fails for some docker storage drivers + run_command: "/usr/sbin/init" + privileged: true + use_sudo: false suites: - name: oss diff --git a/README.md b/README.md index 88c4973..af6d9d0 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ Ansible role for 7.x/6.x Elasticsearch. Currently this works on Debian and RedH * Debian 9 * Debian 10 * CentOS 7 +* Amazon Linux 2 The latest Elasticsearch versions of 7.x & 6.x are actively tested. diff --git a/tasks/elasticsearch-parameters.yml b/tasks/elasticsearch-parameters.yml index 5b5a6c3..e41423a 100644 --- a/tasks/elasticsearch-parameters.yml +++ b/tasks/elasticsearch-parameters.yml @@ -42,4 +42,4 @@ set_fact: m_lock_enabled={{ es_config['bootstrap.memory_lock'] is defined and es_config['bootstrap.memory_lock'] == True }} - name: set fact use_system_d - set_fact: use_system_d={{(ansible_distribution == 'Debian' and ansible_distribution_version is version('8', '>=')) or (ansible_distribution in ['RedHat','CentOS'] and ansible_distribution_version is version('7', '>=')) or (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('15', '>=')) }} + set_fact: use_system_d={{ (ansible_distribution == 'Debian' and ansible_distribution_version is version('8', '>=')) or (ansible_distribution in ['RedHat','CentOS'] and ansible_distribution_version is version('7', '>=')) or (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('15', '>=')) or (ansible_distribution == 'Amazon' and ansible_distribution_version is version('2', '>=')) }} diff --git a/test/matrix.yml b/test/matrix.yml index 5cf9420..a0a67f9 100644 --- a/test/matrix.yml +++ b/test/matrix.yml @@ -9,6 +9,7 @@ OS: - debian-9 - debian-10 - centos-7 + - amazonlinux-2 TEST_TYPE: - oss - oss-upgrade