diff options
author | Jeff Cantrill <jcantril@redhat.com> | 2017-03-13 19:38:56 -0400 |
---|---|---|
committer | Jeff Cantrill <jcantril@redhat.com> | 2017-03-14 08:53:20 -0400 |
commit | 13c4362cf18235614c707aa40ae6820a6e28d42b (patch) | |
tree | e98923390e66fb81332e58b395793ac33df73c45 /roles/openshift_logging/tasks/generate_configmaps.yaml | |
parent | 0ee14573521daf459e9fa8609769c954425979d7 (diff) | |
download | openshift-13c4362cf18235614c707aa40ae6820a6e28d42b.tar.gz openshift-13c4362cf18235614c707aa40ae6820a6e28d42b.tar.bz2 openshift-13c4362cf18235614c707aa40ae6820a6e28d42b.tar.xz openshift-13c4362cf18235614c707aa40ae6820a6e28d42b.zip |
Allow user to specify additions to ES config
Diffstat (limited to 'roles/openshift_logging/tasks/generate_configmaps.yaml')
-rw-r--r-- | roles/openshift_logging/tasks/generate_configmaps.yaml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/roles/openshift_logging/tasks/generate_configmaps.yaml b/roles/openshift_logging/tasks/generate_configmaps.yaml index 8fcf517ad..c1721895c 100644 --- a/roles/openshift_logging/tasks/generate_configmaps.yaml +++ b/roles/openshift_logging/tasks/generate_configmaps.yaml @@ -6,8 +6,17 @@ when: es_logging_contents is undefined changed_when: no + - local_action: > + copy content="{{ config_source | combine(override_config,recursive=True) | to_nice_yaml }}" + 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 + changed_when: no + - template: - src: elasticsearch.yml.j2 + src: "{{local_tmp.stdout}}/elasticsearch-gen-template.yml" dest: "{{mktemp.stdout}}/elasticsearch.yml" vars: - allow_cluster_reader: "{{openshift_logging_es_ops_allow_cluster_reader | lower | default('false')}}" |