diff options
| author | Jeff Cantrill <jcantril@redhat.com> | 2017-10-01 14:54:22 -0400 |
|---|---|---|
| committer | Jan Wozniak <jwozniak@redhat.com> | 2017-10-03 17:06:23 +0200 |
| commit | f4c7d5e064fad263f618fb633d5c0d37c0a2a553 (patch) | |
| tree | c51f44bc24280b0ae27ba05b344885f9603cec08 /roles/openshift_logging/library | |
| parent | ec7d1b04ef91a3d10675efe1c53a88ef100437b8 (diff) | |
| download | openshift-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/library')
| -rw-r--r-- | roles/openshift_logging/library/openshift_logging_facts.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/roles/openshift_logging/library/openshift_logging_facts.py b/roles/openshift_logging/library/openshift_logging_facts.py index 01c0408d8..f10df8da5 100644 --- a/roles/openshift_logging/library/openshift_logging_facts.py +++ b/roles/openshift_logging/library/openshift_logging_facts.py @@ -182,16 +182,14 @@ class OpenshiftLoggingFacts(OCBaseCommand): facts["nodeSelector"] = spec["nodeSelector"] if "supplementalGroups" in spec["securityContext"]: facts["storageGroups"] = spec["securityContext"]["supplementalGroups"] + facts["spec"] = spec if "volumes" in spec: for vol in spec["volumes"]: clone = copy.deepcopy(vol) clone.pop("name", None) facts["volumes"][vol["name"]] = clone for container in spec["containers"]: - facts["containers"][container["name"]] = dict( - image=container["image"], - resources=container["resources"], - ) + facts["containers"][container["name"]] = container self.add_facts_for(comp, "deploymentconfigs", name, facts) def facts_for_services(self, namespace): |