summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_elasticsearch/templates/es.j2
diff options
context:
space:
mode:
authorJeff Cantrill <jcantril@redhat.com>2017-08-17 16:21:58 -0400
committerJeff Cantrill <jcantril@redhat.com>2017-09-29 09:46:23 -0400
commitec7d1b04ef91a3d10675efe1c53a88ef100437b8 (patch)
tree4279a63adcf5c07cb784b08d16b1eb5999328d73 /roles/openshift_logging_elasticsearch/templates/es.j2
parent615e5421137fd786a70b7f7962fe3c6ce6a19cf7 (diff)
downloadopenshift-ec7d1b04ef91a3d10675efe1c53a88ef100437b8.tar.gz
openshift-ec7d1b04ef91a3d10675efe1c53a88ef100437b8.tar.bz2
openshift-ec7d1b04ef91a3d10675efe1c53a88ef100437b8.tar.xz
openshift-ec7d1b04ef91a3d10675efe1c53a88ef100437b8.zip
bug 1482661. Preserve ES dc nodeSelector and supplementalGroups
(cherry picked from commit 601e35cbf4410972c7fa0a1d3d5c6327b82353ac)
Diffstat (limited to 'roles/openshift_logging_elasticsearch/templates/es.j2')
-rw-r--r--roles/openshift_logging_elasticsearch/templates/es.j24
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_logging_elasticsearch/templates/es.j2 b/roles/openshift_logging_elasticsearch/templates/es.j2
index 3c8f390c4..d1edb2d76 100644
--- a/roles/openshift_logging_elasticsearch/templates/es.j2
+++ b/roles/openshift_logging_elasticsearch/templates/es.j2
@@ -29,7 +29,9 @@ spec:
serviceAccountName: aggregated-logging-elasticsearch
securityContext:
supplementalGroups:
- - {{openshift_logging_elasticsearch_storage_group}}
+{% for group in es_storage_groups %}
+ - {{group}}
+{% endfor %}
{% if es_node_selector is iterable and es_node_selector | length > 0 %}
nodeSelector:
{% for key, value in es_node_selector.iteritems() %}