summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'roles/openshift_logging/tasks')
-rw-r--r--roles/openshift_logging/tasks/generate_configmaps.yaml16
1 files changed, 8 insertions, 8 deletions
diff --git a/roles/openshift_logging/tasks/generate_configmaps.yaml b/roles/openshift_logging/tasks/generate_configmaps.yaml
index c1721895c..18df00647 100644
--- a/roles/openshift_logging/tasks/generate_configmaps.yaml
+++ b/roles/openshift_logging/tasks/generate_configmaps.yaml
@@ -7,20 +7,20 @@
changed_when: no
- local_action: >
- copy content="{{ config_source | combine(override_config,recursive=True) | to_nice_yaml }}"
+ template src=elasticsearch.yml.j2
dest="{{local_tmp.stdout}}/elasticsearch-gen-template.yml"
vars:
- config_source: "{{lookup('file','templates/elasticsearch.yml.j2') | from_yaml }}"
- override_config: "{{openshift_logging_es_config | from_yaml}}"
- when: es_logging_contents is undefined
+ - allow_cluster_reader: "{{openshift_logging_es_ops_allow_cluster_reader | lower | default('false')}}"
+ when: es_config_contents is undefined
changed_when: no
- - template:
- src: "{{local_tmp.stdout}}/elasticsearch-gen-template.yml"
+ - copy:
+ content: "{{ config_source | combine(override_config,recursive=True) | to_nice_yaml }}"
dest: "{{mktemp.stdout}}/elasticsearch.yml"
vars:
- - allow_cluster_reader: "{{openshift_logging_es_ops_allow_cluster_reader | lower | default('false')}}"
- when: es_config_contents is undefined
+ config_source: "{{lookup('file','{{local_tmp.stdout}}/elasticsearch-gen-template.yml') | from_yaml }}"
+ override_config: "{{openshift_logging_es_config | from_yaml}}"
+ when: es_logging_contents is undefined
changed_when: no
- copy: