summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/defaults
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-03-21 17:35:41 -0500
committerGitHub <noreply@github.com>2017-03-21 17:35:41 -0500
commit6721d891293a27440deaba92d5203e3a225d46b6 (patch)
treef9e5d1ea21bba2d638580eb70c75389c35949a17 /roles/openshift_logging/defaults
parentbe09be62cf9c3ac7ef1142f494437026d72bd3e7 (diff)
parent13c4362cf18235614c707aa40ae6820a6e28d42b (diff)
downloadopenshift-6721d891293a27440deaba92d5203e3a225d46b6.tar.gz
openshift-6721d891293a27440deaba92d5203e3a225d46b6.tar.bz2
openshift-6721d891293a27440deaba92d5203e3a225d46b6.tar.xz
openshift-6721d891293a27440deaba92d5203e3a225d46b6.zip
Merge pull request #3647 from jcantrill/logging_specify_es_config
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging/defaults')
-rw-r--r--roles/openshift_logging/defaults/main.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml
index 04fd42cbf..75a6e4d69 100644
--- a/roles/openshift_logging/defaults/main.yml
+++ b/roles/openshift_logging/defaults/main.yml
@@ -78,6 +78,8 @@ openshift_logging_es_pvc_prefix: "{{ openshift_hosted_logging_elasticsearch_pvc_
openshift_logging_es_recover_after_time: 5m
openshift_logging_es_storage_group: "{{ openshift_hosted_logging_elasticsearch_storage_group | default('65534') }}"
openshift_logging_es_nodeselector: "{{ openshift_hosted_logging_elasticsearch_nodeselector | default('') | map_from_pairs }}"
+# openshift_logging_es_config is a hash to be merged into the defaults for the elasticsearch.yaml
+openshift_logging_es_config: {}
# allow cluster-admin or cluster-reader to view operations index
openshift_logging_es_ops_allow_cluster_reader: False