From a2739db0e8d6e2a65d9f9ef7f3e7807bbc98431a Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 13 Dec 2022 15:22:56 +0100 Subject: [PATCH] Fix generation of OpenSearch Dashboards config The opensearch config playbook was iterating over opensearch_services, generating a file named opensearch-dashboards.yml containing an empty JSON dictionary. The next task was generating opensearch_dashboards.yml which is actually used by OpenSearch Dashboards. Remove with_dict in the first task to only generate opensearch.yml. Change-Id: I39cf74916630d27cd34ce0783ba8c3c0d20bbddc --- ansible/roles/opensearch/tasks/config.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/ansible/roles/opensearch/tasks/config.yml b/ansible/roles/opensearch/tasks/config.yml index 4c926f1191..afaecb1d75 100644 --- a/ansible/roles/opensearch/tasks/config.yml +++ b/ansible/roles/opensearch/tasks/config.yml @@ -29,22 +29,21 @@ notify: - Restart {{ item.key }} container -- name: Copying over opensearch service config files +- name: Copying over opensearch service config file merge_yaml: sources: - - "{{ role_path }}/templates/{{ item.key }}.yml.j2" + - "{{ role_path }}/templates/opensearch.yml.j2" - "{{ node_custom_config }}/opensearch.yml" - - "{{ node_custom_config }}/opensearch/{{ item.key }}.yml" - - "{{ node_custom_config }}/opensearch/{{ inventory_hostname }}/{{ item.key }}.yml" - dest: "{{ node_config_directory }}/{{ item.key }}/{{ item.key }}.yml" + - "{{ node_custom_config }}/opensearch/opensearch.yml" + - "{{ node_custom_config }}/opensearch/{{ inventory_hostname }}/opensearch.yml" + dest: "{{ node_config_directory }}/opensearch/opensearch.yml" mode: "0660" become: true when: - - inventory_hostname in groups[item.value.group] - - item.value.enabled | bool - with_dict: "{{ opensearch_services }}" + - inventory_hostname in groups['opensearch'] + - opensearch_services['opensearch'].enabled | bool notify: - - Restart {{ item.key }} container + - Restart opensearch container - name: Copying over opensearch-dashboards config file vars: