summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/tasks
diff options
context:
space:
mode:
authorJeff Cantrill <jcantril@redhat.com>2017-10-01 14:54:22 -0400
committerJan Wozniak <jwozniak@redhat.com>2017-10-03 17:06:23 +0200
commitf4c7d5e064fad263f618fb633d5c0d37c0a2a553 (patch)
treec51f44bc24280b0ae27ba05b344885f9603cec08 /roles/openshift_logging/tasks
parentec7d1b04ef91a3d10675efe1c53a88ef100437b8 (diff)
downloadopenshift-f4c7d5e064fad263f618fb633d5c0d37c0a2a553.tar.gz
openshift-f4c7d5e064fad263f618fb633d5c0d37c0a2a553.tar.bz2
openshift-f4c7d5e064fad263f618fb633d5c0d37c0a2a553.tar.xz
openshift-f4c7d5e064fad263f618fb633d5c0d37c0a2a553.zip
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.
Diffstat (limited to 'roles/openshift_logging/tasks')
-rw-r--r--roles/openshift_logging/tasks/install_logging.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml
index 73163272d..de1c5f13a 100644
--- a/roles/openshift_logging/tasks/install_logging.yaml
+++ b/roles/openshift_logging/tasks/install_logging.yaml
@@ -79,6 +79,7 @@
openshift_logging_elasticsearch_pvc_pv_selector: "{{ openshift_logging_es_pv_selector }}"
openshift_logging_elasticsearch_nodeselector: "{{ openshift_logging_es_nodeselector if item.0.nodeSelector | default(None) is none else item.0.nodeSelector }}"
openshift_logging_elasticsearch_storage_group: "{{ [openshift_logging_es_storage_group] if item.0.storageGroups | default([]) | length == 0 else item.0.storageGroups }}"
+ _es_containers: "{{item.0.containers}}"
with_together:
- "{{ openshift_logging_facts.elasticsearch.deploymentconfigs.values() }}"
@@ -144,6 +145,7 @@
openshift_logging_es_hostname: "{{ openshift_logging_es_ops_hostname }}"
openshift_logging_es_edge_term_policy: "{{ openshift_logging_es_ops_edge_term_policy | default('') }}"
openshift_logging_es_allow_external: "{{ openshift_logging_es_ops_allow_external }}"
+ _es_containers: "{{item.0.containers}}"
with_together:
- "{{ openshift_logging_facts.elasticsearch_ops.deploymentconfigs.values() }}"