diff options
| author | Jeff Cantrill <jcantril@redhat.com> | 2017-08-17 16:21:58 -0400 |
|---|---|---|
| committer | Jeff Cantrill <jcantril@redhat.com> | 2017-09-29 09:46:23 -0400 |
| commit | ec7d1b04ef91a3d10675efe1c53a88ef100437b8 (patch) | |
| tree | 4279a63adcf5c07cb784b08d16b1eb5999328d73 /roles/openshift_logging_elasticsearch | |
| parent | 615e5421137fd786a70b7f7962fe3c6ce6a19cf7 (diff) | |
| download | openshift-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')
| -rw-r--r-- | roles/openshift_logging_elasticsearch/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_logging_elasticsearch/tasks/main.yaml | 1 | ||||
| -rw-r--r-- | roles/openshift_logging_elasticsearch/templates/es.j2 | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/roles/openshift_logging_elasticsearch/defaults/main.yml b/roles/openshift_logging_elasticsearch/defaults/main.yml index 75bd479be..4bca32e70 100644 --- a/roles/openshift_logging_elasticsearch/defaults/main.yml +++ b/roles/openshift_logging_elasticsearch/defaults/main.yml @@ -33,7 +33,7 @@ openshift_logging_elasticsearch_pvc_size: "" openshift_logging_elasticsearch_pvc_dynamic: false openshift_logging_elasticsearch_pvc_pv_selector: {} openshift_logging_elasticsearch_pvc_access_modes: ['ReadWriteOnce'] -openshift_logging_elasticsearch_storage_group: '65534' +openshift_logging_elasticsearch_storage_group: ['65534'] openshift_logging_es_pvc_prefix: "{{ openshift_hosted_logging_elasticsearch_pvc_prefix | default('logging-es') }}" diff --git a/roles/openshift_logging_elasticsearch/tasks/main.yaml b/roles/openshift_logging_elasticsearch/tasks/main.yaml index 1e800b1d6..8d5927df6 100644 --- a/roles/openshift_logging_elasticsearch/tasks/main.yaml +++ b/roles/openshift_logging_elasticsearch/tasks/main.yaml @@ -281,6 +281,7 @@ es_cpu_limit: "{{ openshift_logging_elasticsearch_cpu_limit }}" es_memory_limit: "{{ openshift_logging_elasticsearch_memory_limit }}" es_node_selector: "{{ openshift_logging_elasticsearch_nodeselector | default({}) }}" + es_storage_groups: "{{ openshift_logging_elasticsearch_storage_group | default([]) }}" deploy_type: "{{ openshift_logging_elasticsearch_deployment_type }}" es_replicas: 1 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() %} |