diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-08 23:48:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-08 23:48:15 -0800 |
| commit | 15827bd85421fc8fe09487d06efc013292664147 (patch) | |
| tree | 88d4f4af1fe31ece32efa26aabc36bddfbc9a39b /roles/calico/meta | |
| parent | 6254ea23dd7167fa4b548cebd87809a47dc5f778 (diff) | |
| parent | 74730c426025286766971113dd40cc6bf3719267 (diff) | |
| download | openshift-15827bd85421fc8fe09487d06efc013292664147.tar.gz openshift-15827bd85421fc8fe09487d06efc013292664147.tar.bz2 openshift-15827bd85421fc8fe09487d06efc013292664147.tar.xz openshift-15827bd85421fc8fe09487d06efc013292664147.zip | |
Merge pull request #7077 from ewolinetz/logging_facts_sane_yaml_parse
Automatic merge from submit-queue.
Only try to yaml.load a file if it ends in .yml or .yaml in logging facts
Addresses error seen in https://bugzilla.redhat.com/show_bug.cgi?id=1543625
Also prevents us from seeing this when rerunning a deployment for es5.x branch.
When we are trying to load a configmap file to parse it for facts based on the values, we should only parse if it is a yaml or yml file.
Note: if someone created a configmap entry with key that matched that, but wasn't a yaml file, it would still fail... not sure if that can be helped.
Diffstat (limited to 'roles/calico/meta')
0 files changed, 0 insertions, 0 deletions