diff --git a/ansible/roles/log-es6/tasks/elasticsearch-Debian.yml b/ansible/roles/log-es6/tasks/elasticsearch-Debian.yml index ebaaa6174457f44e07a8defb6c0f84474bcd4c96..32b723c320b715569cb10cf95bf5a1dc7482bb04 100644 --- a/ansible/roles/log-es6/tasks/elasticsearch-Debian.yml +++ b/ansible/roles/log-es6/tasks/elasticsearch-Debian.yml @@ -29,6 +29,18 @@ include: elasticsearch-Debian-version-lock.yml when: es_version_lock + #Copy the elasticsearch mandatory variable + +- name: Copy the elasticsearch mandatory variables + become: yes + template: + src: environment.j2 + dest: "{{ env_dir }}/elasticsearch" + owner: "{{ es_user }}" + group: "{{ es_group }}" + mode: 0660 + force: yes + - name: Debian - Ensure elasticsearch is installed become: yes apt: name=elasticsearch{% if es_version is defined and es_version != "" %}={{ es_version }}{% endif %} state=present force={{force_install}} allow_unauthenticated={{ 'no' if es_apt_key else 'yes' }} cache_valid_time=86400 diff --git a/ansible/roles/log-es6/tasks/elasticsearch-config.yml b/ansible/roles/log-es6/tasks/elasticsearch-config.yml index 437b86213f95c44d1475833a344abaf6280523ba..ff788d1c5604ddf91909dff0e583fd81c84ed37e 100644 --- a/ansible/roles/log-es6/tasks/elasticsearch-config.yml +++ b/ansible/roles/log-es6/tasks/elasticsearch-config.yml @@ -15,17 +15,6 @@ file: path={{ item }} state=directory owner={{ es_user }} group={{ es_group }} with_items: - "{{data_dirs}}" - -#Copy the elasticsearch mandatory variable -- name: Copy the elasticsearch mandatory variables - become: yes - template: - src: environment.j2 - dest: "{{ env_dir }}/elasticsearch" - owner: "{{ e_user }}" - group: "{{ es_group }}" - mode: 0660 - force: yes #Copy the config template - name: Copy Configuration File