Merge branch '3.9.5_7.2.1' of https://github.com/wazuh/wazuh-ansible into 3.9.5_7.2.1

This commit is contained in:
manuasir 2019-08-19 15:09:53 +02:00
commit f22bf16a59

View File

@ -9,20 +9,20 @@ lint:
config-data: config-data:
ignore: .virtualenv ignore: .virtualenv
platforms: platforms:
- name: bionic #- name: bionic
image: solita/ubuntu-systemd:bionic # image: solita/ubuntu-systemd:bionic
command: /sbin/init # command: /sbin/init
ulimits: # ulimits:
- nofile:262144:262144 # - nofile:262144:262144
privileged: true # privileged: true
memory_reservation: 2048m # memory_reservation: 2048m
- name: xenial #- name: xenial
image: solita/ubuntu-systemd:xenial # image: solita/ubuntu-systemd:xenial
privileged: true # privileged: true
memory_reservation: 2048m # memory_reservation: 2048m
command: /sbin/init # command: /sbin/init
ulimits: # ulimits:
- nofile:262144:262144 # - nofile:262144:262144
#- name: trusty #- name: trusty
#image: ubuntu:trusty #image: ubuntu:trusty
#privileged: true #privileged: true