ignored Ubuntu Trusty in Testing

This commit is contained in:
Rshad Zhran 2019-07-16 17:23:09 +02:00
parent fc38d565d9
commit 687797a66c
4 changed files with 57 additions and 47 deletions

View File

@ -9,37 +9,38 @@ lint:
config-data:
ignore: .virtualenv
platforms:
# - name: bionic
# image: solita/ubuntu-systemd:bionic
# command: /sbin/init
# ulimits:
# - nofile:262144:262144
# privileged: true
# memory_reservation: 2048m
# - name: xenial
# image: solita/ubuntu-systemd:xenial
# privileged: true
# memory_reservation: 2048m
# command: /sbin/init
# ulimits:
# - nofile:262144:262144
- name: trusty
image: ubuntu:trusty
- name: bionic
image: solita/ubuntu-systemd:bionic
command: /sbin/init
ulimits:
- nofile:262144:262144
privileged: true
memory_reservation: 2048m
- name: xenial
image: solita/ubuntu-systemd:xenial
privileged: true
memory_reservation: 2048m
command: /sbin/init
ulimits:
- nofile:262144:262144
# - name: trusty
# image: ubuntu:trusty
# privileged: true
# memory_reservation: 2048m
# ulimits:
# - nofile:262144:262144
- name: centos6
image: centos:6
privileged: true
memory_reservation: 2048m
ulimits:
- nofile:262144:262144
# - name: centos6
# image: centos:6
# privileged: true
# memory_reservation: 2048m
# ulimits:
# - nofile:262144:262144
# - name: centos7
# image: milcom/centos7-systemd
# memory_reservation: 2048m
# privileged: true
# ulimits:
# - nofile:262144:262144
- name: centos7
image: milcom/centos7-systemd
memory_reservation: 2048m
privileged: true
ulimits:
- nofile:262144:262144
provisioner:
name: ansible
playbooks:

View File

@ -23,11 +23,11 @@ platforms:
command: /sbin/init
ulimits:
- nofile:262144:262144
- name: trusty
image: ubuntu:trusty
memory_reservation: 1024m
ulimits:
- nofile:262144:262144
# - name: trusty
# image: ubuntu:trusty
# memory_reservation: 1024m
# ulimits:
# - nofile:262144:262144
- name: centos6
image: centos:6
privileged: true

View File

@ -32,20 +32,6 @@
- ansible_distribution == "Ubuntu"
- ansible_distribution_major_version | int == 14
#- name: Set the default Java version
# become: yes
# shell: update-alternatives --config java
# when:
# - ansible_distribution == "Ubuntu"
# - ansible_distribution_major_version | int == 14#
#- name: Set the default Javac version
# become: yes
# shell: update-alternatives --config javac
# when:
# - ansible_distribution == "Ubuntu"
# - ansible_distribution_major_version | int == 14
- name: Update and upgrade apt packages
become: true
apt:

View File

@ -197,6 +197,28 @@
when:
- elasticsearch_xpack_security
- name: Trusty | set MAX_LOCKED_MEMORY=unlimited in Elasticsearch in /etc/security/limits.conf
lineinfile:
path: /etc/security/limits.conf
line: elasticsearch - memlock unlimited
create: yes
become: yes
when:
- ansible_distribution == "Ubuntu"
- ansible_distribution_major_version | int == 14
changed_when: false
- name: Trusty | set MAX_LOCKED_MEMORY=unlimited in Elasticsearch in /etc/security/limits.d/elasticsearch.conf
lineinfile:
path: /etc/security/limits.d/elasticsearch.conf
line: elasticsearch - memlock unlimited
create: yes
become: yes
changed_when: false
when:
- ansible_distribution == "Ubuntu"
- ansible_distribution_major_version | int == 14
- name: Distribution != one of [ centos 6.*, trusty ] | Reload systemd
systemd: daemon_reload=true
ignore_errors: true
@ -211,6 +233,7 @@
- name: Distribution is centos 6.* | Start Elasticsearch
service: name=elasticsearch state=started
ignore_errors: true
- name: Ensure Elasticsearch started and enabled
service: