diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-03-31 09:01:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 09:01:45 -0500 |
| commit | adadbf656c7b791bee364633ef8706f5e94421f7 (patch) | |
| tree | 5bb3a14a05802573f718761c6c34eb52f495e7fb /roles/openshift_logging/tasks | |
| parent | 4ebf81f1d1b3a1277c1f3cae784882edbe183fe5 (diff) | |
| parent | a222702ed4316f99eac497ac755c5349804c66d2 (diff) | |
| download | openshift-adadbf656c7b791bee364633ef8706f5e94421f7.tar.gz openshift-adadbf656c7b791bee364633ef8706f5e94421f7.tar.bz2 openshift-adadbf656c7b791bee364633ef8706f5e94421f7.tar.xz openshift-adadbf656c7b791bee364633ef8706f5e94421f7.zip | |
Merge pull request #3777 from jcantrill/es_logging
Merged by openshift-bot
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 18df00647..253543f54 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: > template src=elasticsearch.yml.j2 |