santerikainulainen/ansible-role-elasticsearch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ansible code simplification after review

Browse source
This commit is contained in:
Julien Mailleret 2019-12-02 14:15:00 +01:00
parent bc7fc40b34
commit ea4d6cf43a
No known key found for this signature in database
GPG key ID: F065093271C8DE71
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
defaults/main.yml
View file

@ -20,9 +20,9 @@ es_templates: false
es_user: elasticsearch es_user: elasticsearch
es_group: elasticsearch es_group: elasticsearch
es_config: {} es_config: {}
es_config_default: "" es_config_default: "elasticsearch.j2"
es_config_log4j2: "" es_config_log4j2: ""
es_config_jvm: "" es_config_jvm: "jvm.options.j2"
#Need to provide default directories #Need to provide default directories
es_conf_dir: "/etc/elasticsearch" es_conf_dir: "/etc/elasticsearch"
es_pid_dir: "/var/run/elasticsearch" es_pid_dir: "/var/run/elasticsearch"

4
tasks/elasticsearch-config.yml
View file

@ -51,7 +51,7 @@
- name: Copy Default File - name: Copy Default File
become: yes become: yes
template: template:
src: "{% if es_config_default != '' %}{{ es_config_default }}{% else %}elasticsearch.j2{% endif %}" src: "{{ es_config_default }}"
dest: "{{ default_file }}" dest: "{{ default_file }}"
owner: root owner: root
group: "{{ es_group }}" group: "{{ es_group }}"
@ -83,7 +83,7 @@
- name: Copy jvm.options File - name: Copy jvm.options File
become: yes become: yes
template: template:
src: "{% if es_config_jvm != '' %}{{ es_config_jvm }}{% else %}jvm.options.j2{% endif %}" src: "{{ es_config_jvm }}"
dest: "{{ es_conf_dir }}/jvm.options" dest: "{{ es_conf_dir }}/jvm.options"
owner: root owner: root
group: "{{ es_group }}" group: "{{ es_group }}"