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_elasticsearch/vars/main.yml | |
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_elasticsearch/vars/main.yml')
-rw-r--r-- | roles/openshift_logging_elasticsearch/vars/main.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/roles/openshift_logging_elasticsearch/vars/main.yml b/roles/openshift_logging_elasticsearch/vars/main.yml index 122231031..aa8d583ba 100644 --- a/roles/openshift_logging_elasticsearch/vars/main.yml +++ b/roles/openshift_logging_elasticsearch/vars/main.yml @@ -4,7 +4,6 @@ __allowed_es_versions: ["3_5", "3_6", "3_7", "3_8", "3_9"] __allowed_es_types: ["data-master", "data-client", "master", "client"] __es_log_appenders: ['file', 'console'] __kibana_index_modes: ["unique", "shared_ops"] -__es_version: "2.4.4" __es_local_curl: "curl -s --cacert /etc/elasticsearch/secret/admin-ca --cert /etc/elasticsearch/secret/admin-cert --key /etc/elasticsearch/secret/admin-key" |