diff options
| author | Jeff Cantrill <jcantril@redhat.com> | 2017-03-27 15:10:25 -0400 |
|---|---|---|
| committer | Jeff Cantrill <jcantril@redhat.com> | 2017-03-30 12:36:53 -0400 |
| commit | a222702ed4316f99eac497ac755c5349804c66d2 (patch) | |
| tree | 2a6beb2e5947f90875d1d654d9d213dc3c22f6b5 /roles/openshift_logging/tasks | |
| parent | f0cdf051ef01978269482a72ae074b822daeea3b (diff) | |
| download | openshift-a222702ed4316f99eac497ac755c5349804c66d2.tar.gz openshift-a222702ed4316f99eac497ac755c5349804c66d2.tar.bz2 openshift-a222702ed4316f99eac497ac755c5349804c66d2.tar.xz openshift-a222702ed4316f99eac497ac755c5349804c66d2.zip | |
bug 1432607. Allow configuration of ES log destination
Diffstat (limited to 'roles/openshift_logging/tasks')
| -rw-r--r-- | roles/openshift_logging/tasks/generate_configmaps.yaml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/roles/openshift_logging/tasks/generate_configmaps.yaml b/roles/openshift_logging/tasks/generate_configmaps.yaml index c1721895c..e57e564a4 100644 --- a/roles/openshift_logging/tasks/generate_configmaps.yaml +++ b/roles/openshift_logging/tasks/generate_configmaps.yaml @@ -1,10 +1,20 @@ --- - block: - - copy: - src: elasticsearch-logging.yml + - fail: + msg: "The openshift_logging_es_log_appenders '{{openshift_logging_es_log_appenders}}' has an unrecognized option and only supports the following as a list: {{es_log_appenders | join(', ')}}" + when: + - es_logging_contents is undefined + - "{{ openshift_logging_es_log_appenders | list | difference(es_log_appenders) | length != 0 }}" + changed_when: no + + - template: + src: elasticsearch-logging.yml.j2 dest: "{{mktemp.stdout}}/elasticsearch-logging.yml" + vars: + root_logger: "{{openshift_logging_es_log_appenders | join(', ')}}" when: es_logging_contents is undefined changed_when: no + check_mode: no - local_action: > copy content="{{ config_source | combine(override_config,recursive=True) | to_nice_yaml }}" |