diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-17 15:46:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-17 15:46:45 -0400 |
| commit | eedee4481030c8a34c27e7c426671e508f0f8909 (patch) | |
| tree | c437bb56dadb305f6b2a9c123c86f025dc3c5836 /roles/openshift_logging_elasticsearch/tasks | |
| parent | cf1aa0e3bc4bc207a0da718695326b6850b90610 (diff) | |
| parent | 88e07e21c7048352d5b537d95f4f57ac07c9b41f (diff) | |
| download | openshift-eedee4481030c8a34c27e7c426671e508f0f8909.tar.gz openshift-eedee4481030c8a34c27e7c426671e508f0f8909.tar.bz2 openshift-eedee4481030c8a34c27e7c426671e508f0f8909.tar.xz openshift-eedee4481030c8a34c27e7c426671e508f0f8909.zip | |
Merge pull request #4773 from jcantrill/fix_console_logging
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging_elasticsearch/tasks')
| -rw-r--r-- | roles/openshift_logging_elasticsearch/tasks/main.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/roles/openshift_logging_elasticsearch/tasks/main.yaml b/roles/openshift_logging_elasticsearch/tasks/main.yaml index 5593fac3a..28c3ffd96 100644 --- a/roles/openshift_logging_elasticsearch/tasks/main.yaml +++ b/roles/openshift_logging_elasticsearch/tasks/main.yaml @@ -107,9 +107,16 @@ - openshift_logging_elasticsearch_kibana_index_mode in __kibana_index_modes msg: "The openshift_logging_elasticsearch_kibana_index_mode '{{ openshift_logging_elasticsearch_kibana_index_mode }}' only supports one of: {{ __kibana_index_modes | join(', ') }}" +- assert: + that: + - "{{ openshift_logging_es_log_appenders | length > 0 }}" + 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(', ') }}" + - template: src: elasticsearch-logging.yml.j2 dest: "{{ tempdir }}/elasticsearch-logging.yml" + vars: + root_logger: "{{openshift_logging_es_log_appenders | join(', ')}}" when: es_logging_contents is undefined changed_when: no |