fixed some molecule errors

This commit is contained in:
Rshad Zhran 2019-08-16 19:23:46 +02:00
parent cae6e96be6
commit 7ab3f960c8
7 changed files with 26 additions and 30 deletions

View File

@ -15,7 +15,7 @@ python_version = "2.7"
[scripts] [scripts]
clean = "molecule destroy" clean = "molecule destroy"
test ="molecule test" test ="molecule test --destroy=never"
agent ="molecule test -s wazuh-agent" agent ="molecule test -s wazuh-agent"
elasticsearch ="molecule test -s elasticsearch" elasticsearch ="molecule test -s elasticsearch"
filebeat ="molecule test -s filebeat" filebeat ="molecule test -s filebeat"

View File

@ -8,18 +8,22 @@ lint:
enabled: false enabled: false
platforms: platforms:
- name: bionic - name: bionic
image: ubuntu:bionic image: solita/ubuntu-systemd:bionic
- name: xenial
image: solita/ubuntu-systemd:xenial
privileged: true
command: /sbin/init command: /sbin/init
- name: trusty
image: ubuntu:trusty
- name: centos6
image: centos:6
- name: centos7
image: milcom/centos7-systemd
privileged: true privileged: true
ulimits:
- nofile:262144:262144
# - name: xenial
# image: solita/ubuntu-systemd:xenial
# privileged: true
# command: /sbin/init
# - name: trusty
# image: ubuntu:trusty
# - name: centos6
# image: centos:6
# - name: centos7
# image: milcom/centos7-systemd
# privileged: true
provisioner: provisioner:
name: ansible name: ansible
env: env:

View File

@ -3,8 +3,6 @@
hosts: all hosts: all
roles: roles:
- role: wazuh/ansible-wazuh-manager - role: wazuh/ansible-wazuh-manager
- {role: wazuh/ansible-filebeat, filebeat_output_elasticsearch_hosts: 'localhost:9200'}
# - {role: wazuh/ansible-filebeat} #, filebeat_output_elasticsearch_hosts: 'your elastic stack server IP' - {role: elastic-stack/ansible-elasticsearch, elasticsearch_network_host: 'localhost'}
# Elasticsearch requires too much memory to test multiple containers concurrently - To Fix - {role: elastic-stack/ansible-kibana, elasticsearch_network_host: 'localhost'}
# - {role: elastic-stack/ansible-elasticsearch, elasticsearch_network_host: 'localhost'}
# - {role: elastic-stack/ansible-kibana, elasticsearch_network_host: 'localhost'}

View File

@ -11,7 +11,7 @@ lint:
platforms: platforms:
# - name: trusty # - name: trusty
# image: ubuntu:trusty # image: ubuntu:trusty
# - name: bionic - name: bionic
image: solita/ubuntu-systemd:bionic image: solita/ubuntu-systemd:bionic
command: /sbin/init command: /sbin/init
privileged: true privileged: true

View File

@ -2,5 +2,6 @@
- name: Converge - name: Converge
hosts: all hosts: all
roles: roles:
- role: elastic-stack/ansible-kibana - role: elastic-stack/ansible-kibana

View File

@ -245,13 +245,6 @@
- not (ansible_distribution == "Debian" and ansible_distribution_version is version('8', '<')) - not (ansible_distribution == "Debian" and ansible_distribution_version is version('8', '<'))
- not (ansible_os_family == "RedHat" and ansible_distribution_version is version('7', '<')) - not (ansible_os_family == "RedHat" and ansible_distribution_version is version('7', '<'))
- name: Distribution is centos 6.* | Enable Elasticsearch
service: name=elasticsearch enabled=yes
- name: Distribution is centos 6.* | Start Elasticsearch
service: name=elasticsearch state=started
ignore_errors: true
- name: Ensure Elasticsearch started and enabled - name: Ensure Elasticsearch started and enabled
service: service:
name: elasticsearch name: elasticsearch