replace hardcoded /etc/elasticsearch dir by the good variable

This commit is contained in:
Julien Mailleret 2019-09-18 10:04:50 +02:00
parent c8b666bd79
commit 79470cb344
No known key found for this signature in database
GPG key ID: F065093271C8DE71
3 changed files with 5 additions and 5 deletions

View file

@ -92,7 +92,7 @@
register: debian_elasticsearch_install_from_repo register: debian_elasticsearch_install_from_repo
notify: restart elasticsearch notify: restart elasticsearch
environment: environment:
ES_PATH_CONF: "/etc/elasticsearch" ES_PATH_CONF: "{{ es_conf_dir }}"
- name: Debian - hold elasticsearch version - name: Debian - hold elasticsearch version
become: yes become: yes
@ -112,4 +112,4 @@
register: elasticsearch_install_from_package register: elasticsearch_install_from_package
notify: restart elasticsearch notify: restart elasticsearch
environment: environment:
ES_PATH_CONF: "/etc/elasticsearch" ES_PATH_CONF: "{{ es_conf_dir }}"

View file

@ -52,7 +52,7 @@
retries: 5 retries: 5
delay: 10 delay: 10
environment: environment:
ES_PATH_CONF: "/etc/elasticsearch" ES_PATH_CONF: "{{ es_conf_dir }}"
- name: RedHat - Install Elasticsearch from url - name: RedHat - Install Elasticsearch from url
become: yes become: yes

View file

@ -2,13 +2,13 @@
- name: ensure templates dir is created - name: ensure templates dir is created
file: file:
path: /etc/elasticsearch/templates path: "{{ es_conf_dir }}/templates"
state: directory state: directory
owner: "{{ es_user }}" owner: "{{ es_user }}"
group: "{{ es_group }}" group: "{{ es_group }}"
- name: Copy templates to elasticsearch - name: Copy templates to elasticsearch
copy: src={{ item }} dest=/etc/elasticsearch/templates owner={{ es_user }} group={{ es_group }} copy: src={{ item }} dest={{ es_conf_dir }}/templates owner={{ es_user }} group={{ es_group }}
register: load_templates register: load_templates
with_fileglob: with_fileglob:
- "{{ es_templates_fileglob | default('') }}" - "{{ es_templates_fileglob | default('') }}"