diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-05 03:45:06 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-05 03:45:06 -0700 |
commit | cdbc995e65921210981e9fb3710a36c7d93a35dc (patch) | |
tree | 7475e2b3302da859fe60513f7c535c912aab6f0b /roles/openshift_logging_elasticsearch/defaults | |
parent | 6efc786c94afa7eb9270b92d3d7022f190a3de48 (diff) | |
parent | f4c7d5e064fad263f618fb633d5c0d37c0a2a553 (diff) | |
download | openshift-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_elasticsearch/defaults')
-rw-r--r-- | roles/openshift_logging_elasticsearch/defaults/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_logging_elasticsearch/defaults/main.yml b/roles/openshift_logging_elasticsearch/defaults/main.yml index 72d5cab96..554aa5bb2 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') }}" |