From 74730c426025286766971113dd40cc6bf3719267 Mon Sep 17 00:00:00 2001 From: Eric Wolinetz Date: Thu, 8 Feb 2018 15:28:11 -0600 Subject: Only try to yaml.load a file if it ends in .yml or .yaml in logging facts --- roles/openshift_logging/library/openshift_logging_facts.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'roles/openshift_logging/library') diff --git a/roles/openshift_logging/library/openshift_logging_facts.py b/roles/openshift_logging/library/openshift_logging_facts.py index 37ffb0204..a7f9fdc8e 100644 --- a/roles/openshift_logging/library/openshift_logging_facts.py +++ b/roles/openshift_logging/library/openshift_logging_facts.py @@ -208,9 +208,10 @@ class OpenshiftLoggingFacts(OCBaseCommand): def facts_from_configmap(self, comp, kind, name, config_key, yaml_file=None): '''Extracts facts in logging namespace from configmap''' if yaml_file is not None: - config_facts = yaml.load(yaml_file) - self.facts[comp][kind][name][config_key] = config_facts - self.facts[comp][kind][name]["raw"] = yaml_file + if config_key.endswith(".yml") or config_key.endswith(".yaml"): + config_facts = yaml.load(yaml_file) + self.facts[comp][kind][name][config_key] = config_facts + self.facts[comp][kind][name][config_key]["raw"] = yaml_file def facts_for_configmaps(self, namespace): ''' Gathers facts for configmaps in logging namespace ''' -- cgit v1.2.1