add debian 10 support (#699)
* add debian 10 support * install jdk11 for debian 10 and elasticsearch 6
This commit is contained in:
parent
cab03ece10
commit
8a2ab0ce0e
4 changed files with 18 additions and 1 deletions
14
.kitchen.yml
14
.kitchen.yml
|
|
@ -94,6 +94,20 @@ platforms:
|
||||||
- /etc # This fixes certain java file actions that check the mount point. Without this adding users fails for some docker storage drivers
|
- /etc # This fixes certain java file actions that check the mount point. Without this adding users fails for some docker storage drivers
|
||||||
use_sudo: false
|
use_sudo: false
|
||||||
run_command: "/sbin/init"
|
run_command: "/sbin/init"
|
||||||
|
- name: debian-10
|
||||||
|
driver_config:
|
||||||
|
image: debian:10
|
||||||
|
privileged: true
|
||||||
|
provision_command:
|
||||||
|
- apt-get update -q && apt-get install -y -q gnupg2 python-jmespath systemd-sysv
|
||||||
|
- echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main" > /etc/apt/sources.list.d/ansible.list
|
||||||
|
- apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367
|
||||||
|
- apt-get update -q && apt-get install -y -q ansible
|
||||||
|
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
|
||||||
|
use_sudo: false
|
||||||
|
run_command: "/sbin/init"
|
||||||
- name: centos-7
|
- name: centos-7
|
||||||
driver_config:
|
driver_config:
|
||||||
image: centos:7
|
image: centos:7
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ Ansible role for 7.x/6.x Elasticsearch. Currently this works on Debian and RedH
|
||||||
* Ubuntu 18.04
|
* Ubuntu 18.04
|
||||||
* Debian 8
|
* Debian 8
|
||||||
* Debian 9
|
* Debian 9
|
||||||
|
* Debian 10
|
||||||
* CentOS 7
|
* CentOS 7
|
||||||
|
|
||||||
The latest Elasticsearch versions of 7.x & 6.x are actively tested.
|
The latest Elasticsearch versions of 7.x & 6.x are actively tested.
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ OS:
|
||||||
- ubuntu-1804
|
- ubuntu-1804
|
||||||
- debian-8
|
- debian-8
|
||||||
- debian-9
|
- debian-9
|
||||||
|
- debian-10
|
||||||
- centos-7
|
- centos-7
|
||||||
TEST_TYPE:
|
TEST_TYPE:
|
||||||
- oss
|
- oss
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
---
|
---
|
||||||
java: "{% if es_java is defined %}{{es_java}}{% else %}openjdk-8-jre-headless{% endif %}"
|
java_version: "{% if ansible_os_family == 'Debian' and ansible_distribution_major_version == '10' %}11{% else %}8{% endif %}"
|
||||||
|
java: "{% if es_java is defined %}{{es_java}}{% else %}openjdk-{{ java_version }}-jre-headless{% endif %}"
|
||||||
default_file: "/etc/default/elasticsearch"
|
default_file: "/etc/default/elasticsearch"
|
||||||
es_home: "/usr/share/elasticsearch"
|
es_home: "/usr/share/elasticsearch"
|
||||||
es_apt_key_id: "46095ACC8548582C1A2699A9D27D666CD88E42B4"
|
es_apt_key_id: "46095ACC8548582C1A2699A9D27D666CD88E42B4"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue