summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/defaults
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-05 03:45:06 -0700
committerGitHub <noreply@github.com>2017-10-05 03:45:06 -0700
commitcdbc995e65921210981e9fb3710a36c7d93a35dc (patch)
tree7475e2b3302da859fe60513f7c535c912aab6f0b /roles/openshift_logging/defaults
parent6efc786c94afa7eb9270b92d3d7022f190a3de48 (diff)
parentf4c7d5e064fad263f618fb633d5c0d37c0a2a553 (diff)
downloadopenshift-cdbc995e65921210981e9fb3710a36c7d93a35dc.tar.gz
openshift-cdbc995e65921210981e9fb3710a36c7d93a35dc.tar.bz2
openshift-cdbc995e65921210981e9fb3710a36c7d93a35dc.tar.xz
openshift-cdbc995e65921210981e9fb3710a36c7d93a35dc.zip
Merge pull request #5637 from wozniakjan/1496271_fix
Automatic merge from submit-queue. Bug 1496271 - Perserve SCC for ES local persistent storage ES can be modified to use node local persistent storage. This requires changing SCC and is described in docs: https://docs.openshift.com/container-platform/3.6/install_config/aggregate_logging.html During an upgrade, SCC defined by the user is ignored. This fix fetches SCC user defined as a fact and adds it to the ES DC which is later used. Also includes cherrypicked fix for - Bug 1482661 - Preserve ES dc nodeSelector and supplementalGroups cc @jcantrill
Diffstat (limited to 'roles/openshift_logging/defaults')
-rw-r--r--roles/openshift_logging/defaults/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml
index 0f1f659c6..6e7e2557f 100644
--- a/roles/openshift_logging/defaults/main.yml
+++ b/roles/openshift_logging/defaults/main.yml
@@ -94,7 +94,7 @@ openshift_logging_es_pvc_dynamic: "{{ openshift_logging_elasticsearch_pvc_dynami
openshift_logging_es_pvc_size: "{{ openshift_logging_elasticsearch_pvc_size | default('') }}"
openshift_logging_es_pvc_prefix: "{{ openshift_logging_elasticsearch_pvc_prefix | default('logging-es') }}"
openshift_logging_es_recover_after_time: 5m
-openshift_logging_es_storage_group: "{{ openshift_logging_elasticsearch_storage_group | default('65534') }}"
+openshift_logging_es_storage_group: "65534"
openshift_logging_es_nodeselector: {}
# openshift_logging_es_config is a hash to be merged into the defaults for the elasticsearch.yaml
openshift_logging_es_config: {}
@@ -133,7 +133,7 @@ openshift_logging_es_ops_pvc_dynamic: "{{ openshift_logging_elasticsearch_ops_pv
openshift_logging_es_ops_pvc_size: "{{ openshift_logging_elasticsearch_ops_pvc_size | default('') }}"
openshift_logging_es_ops_pvc_prefix: "{{ openshift_logging_elasticsearch_ops_pvc_prefix | default('logging-es-ops') }}"
openshift_logging_es_ops_recover_after_time: 5m
-openshift_logging_es_ops_storage_group: "{{ openshift_logging_elasticsearch_storage_group | default('65534') }}"
+openshift_logging_es_ops_storage_group: "65534"
openshift_logging_es_ops_nodeselector: {}
# for exposing es-ops to external (outside of the cluster) clients