diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-06 09:23:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 09:23:18 -0800 |
| commit | fa6c7cc621ff05b35eadc846d3960ac2dc1009c0 (patch) | |
| tree | 43e1137f4034514e88194e9109640f7b60817a2a /roles/openshift_logging/tasks | |
| parent | 75e1741b2068f6b01a9e77db0c0518f5c0154822 (diff) | |
| parent | 2e1598117fe896033a3f290820c8e8dfbc42bd81 (diff) | |
| download | openshift-fa6c7cc621ff05b35eadc846d3960ac2dc1009c0.tar.gz openshift-fa6c7cc621ff05b35eadc846d3960ac2dc1009c0.tar.bz2 openshift-fa6c7cc621ff05b35eadc846d3960ac2dc1009c0.tar.xz openshift-fa6c7cc621ff05b35eadc846d3960ac2dc1009c0.zip | |
Merge pull request #6628 from ewolinetz/es_5.x_opt_in
Automatic merge from submit-queue.
Es 5.x opt in
FYI @richm @jcantrill
Diffstat (limited to 'roles/openshift_logging/tasks')
| -rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 8 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/main.yaml | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index c905502ac..9fabc5826 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -59,6 +59,14 @@ vars: generated_certs_dir: "{{openshift.common.config_base}}/logging" +- set_fact: + __base_file_dir: "{{ '5.x' if openshift_logging_es5_techpreview | bool else '2.x' }}" + __es_version: "{{ '5.x' if openshift_logging_es5_techpreview | bool else '2.x' }}" + +- set_fact: + openshift_logging_image_version: "techpreview" + when: openshift_logging_es5_techpreview | bool + ## Elasticsearch - set_fact: es_indices={{ es_indices | default([]) + [item | int - 1] }} diff --git a/roles/openshift_logging/tasks/main.yaml b/roles/openshift_logging/tasks/main.yaml index 60cc399fa..57426bc77 100644 --- a/roles/openshift_logging/tasks/main.yaml +++ b/roles/openshift_logging/tasks/main.yaml @@ -3,6 +3,11 @@ msg: Only one Fluentd nodeselector key pair should be provided when: openshift_logging_fluentd_nodeselector.keys() | count > 1 +- assert: + that: openshift_deployment_type in ['origin'] + msg: "Only 'origin' deployments are allowed with openshift_logging_es5_techpreview set to true" + when: openshift_logging_es5_techpreview | bool + - name: Create temp directory for doing work in command: mktemp -d /tmp/openshift-logging-ansible-XXXXXX register: mktemp |