Remove daemon reload and centos 6 blocks

This commit is contained in:
Jose M 2019-07-30 17:35:20 +02:00
parent d877738d45
commit fbbf79a153

View File

@ -214,44 +214,27 @@
when: when:
- elasticsearch_xpack_security - elasticsearch_xpack_security
# - name: Trusty | set MAX_LOCKED_MEMORY=unlimited in Elasticsearch in /etc/security/limits.conf - name: Trusty | set MAX_LOCKED_MEMORY=unlimited in Elasticsearch in /etc/security/limits.conf
# lineinfile: lineinfile:
# path: /etc/security/limits.conf path: /etc/security/limits.conf
# line: elasticsearch - memlock unlimited line: elasticsearch - memlock unlimited
# create: yes create: yes
# become: true become: true
# when: when:
# - ansible_distribution == "Ubuntu" - ansible_distribution == "Ubuntu"
# - ansible_distribution_major_version | int == 14 - ansible_distribution_major_version | int == 14
# changed_when: false 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: true
# 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
# when:
# - not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA")
# - not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('15.04', '<'))
# - not (ansible_distribution == "Debian" and ansible_distribution_version is version('8', '<'))
# - 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: 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: true
changed_when: false
when:
- ansible_distribution == "Ubuntu"
- ansible_distribution_major_version | int == 14
- name: Ensure Elasticsearch started and enabled - name: Ensure Elasticsearch started and enabled
service: service:
name: elasticsearch name: elasticsearch
@ -267,32 +250,6 @@
- configure - configure
- init - init
- name: Check for Wazuh Alerts template (http)
uri:
url: "http://{{ elasticsearch_network_host }}:{{ elasticsearch_http_port }}/_template/wazuh"
method: GET
status_code: 200, 404
when:
- elasticsearch_bootstrap_node or single_node
- not elasticsearch_xpack_security
poll: 30
register: wazuh_alerts_template_exits
until: wazuh_alerts_template_exits is succeeded
tags: init
- name: Installing Wazuh Alerts template (http)
uri:
url: "http://{{ elasticsearch_network_host }}:{{ elasticsearch_http_port }}/_template/wazuh"
method: PUT
status_code: 200
body_format: json
body: "{{ lookup('template','wazuh-elastic7-template-alerts.json.j2') }}"
when:
- wazuh_alerts_template_exits.status is defined
- wazuh_alerts_template_exits.status != 200
- not elasticsearch_xpack_security
tags: init
- import_tasks: "RMRedHat.yml" - import_tasks: "RMRedHat.yml"
when: ansible_os_family == "RedHat" when: ansible_os_family == "RedHat"