summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_elasticsearch
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-09-08 11:16:04 -0400
committerGitHub <noreply@github.com>2017-09-08 11:16:04 -0400
commit756ab33088b81ea21eab20869c11dd9d7b2dab7b (patch)
tree7daf5c35a4ef5fb9ddbb0ccc4bb9b129a86e8299 /roles/openshift_logging_elasticsearch
parentfaed701d8fd50e7ce6540fd59c2f15fea82de0f6 (diff)
parentd2bf958251e4092ba90218cd3cc20621483b3057 (diff)
downloadopenshift-756ab33088b81ea21eab20869c11dd9d7b2dab7b.tar.gz
openshift-756ab33088b81ea21eab20869c11dd9d7b2dab7b.tar.bz2
openshift-756ab33088b81ea21eab20869c11dd9d7b2dab7b.tar.xz
openshift-756ab33088b81ea21eab20869c11dd9d7b2dab7b.zip
Merge pull request #5289 from jcantrill/1487573_fix_allowed_es_version
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging_elasticsearch')
-rw-r--r--roles/openshift_logging_elasticsearch/vars/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging_elasticsearch/vars/main.yml b/roles/openshift_logging_elasticsearch/vars/main.yml
index 20fa63543..09e2ee4d0 100644
--- a/roles/openshift_logging_elasticsearch/vars/main.yml
+++ b/roles/openshift_logging_elasticsearch/vars/main.yml
@@ -1,6 +1,6 @@
---
-__latest_es_version: "3_5"
-__allowed_es_versions: ["3_5", "3_6"]
+__latest_es_version: "3_6"
+__allowed_es_versions: ["3_5", "3_6", "3_7"]
__allowed_es_types: ["data-master", "data-client", "master", "client"]
__es_log_appenders: ['file', 'console']
__kibana_index_modes: ["unique", "shared_ops"]