openstack/openstack-ansible-ops
Code Issues Proposed changes

Merge "Explicitly use Elasticsearch data node for ILM index update"

Browse Source
This commit is contained in:
Zuul 2020-02-10 17:09:12 +00:00 committed by Gerrit Code Review
commit 80c4bc93b1
2 changed files with 4 additions and 2 deletions
elk_metrics_7x/roles/elastic_ilm
defaults
main.yml
tasks
main.yml

2
elk_metrics_7x/roles/elastic_ilm/defaults/main.yml

@ -16,3 +16,5 @@ default_ilm_policy:
delete: {} delete: {}
default_ilm_policy_filename: "default-ilm-policy.json" default_ilm_policy_filename: "default-ilm-policy.json"
default_ilm_policy_file_location: "/tmp" default_ilm_policy_file_location: "/tmp"
elastic_beat_no_proxy: "{{ hostvars[groups['elastic-logstash'][0]]['ansible_host'] }}"

4
elk_metrics_7x/roles/elastic_ilm/tasks/main.yml

@ -5,8 +5,8 @@
- block: - block:
- name: Update policy and template when not upgrading - name: Update policy and template when not upgrading
include_tasks: "elastic_ilm_update_policy.yml" include_tasks: "elastic_ilm_update_policy.yml"
delegate_to: "{{ groups['elastic-logstash'][0] }}" delegate_to: "{{ elasticsearch_data_node_details[0] | regex_replace(':' ~ elastic_port,'') }}"
environment: environment:
no_proxy: "{{ hostvars[groups['elastic-logstash'][0]]['ansible_host'] }},127.0.0.1" no_proxy: "{{ elastic_beat_no_proxy }},127.0.0.1"
run_once: True run_once: True
when: (elk_package_state | default('present')) != "latest" when: (elk_package_state | default('present')) != "latest"