summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/tasks
diff options
context:
space:
mode:
authorEric Wolinetz <ewolinet@redhat.com>2018-01-05 11:06:43 -0600
committerEric Wolinetz <ewolinet@redhat.com>2018-02-05 13:44:16 -0600
commitd5879135f077e4aaaa09c8e4ebf5d9ef2a063a78 (patch)
tree1e07b2d1dba87ea685899c167ddc2c85c68344ed /roles/openshift_logging/tasks
parent3e2c7c22a54a3ccf88b49742003a3a4a937683f8 (diff)
downloadopenshift-d5879135f077e4aaaa09c8e4ebf5d9ef2a063a78.tar.gz
openshift-d5879135f077e4aaaa09c8e4ebf5d9ef2a063a78.tar.bz2
openshift-d5879135f077e4aaaa09c8e4ebf5d9ef2a063a78.tar.xz
openshift-d5879135f077e4aaaa09c8e4ebf5d9ef2a063a78.zip
Adding support for ES 5.x tech preview opt in
Diffstat (limited to 'roles/openshift_logging/tasks')
-rw-r--r--roles/openshift_logging/tasks/install_logging.yaml8
-rw-r--r--roles/openshift_logging/tasks/main.yaml5
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