From 8a1775c1b72d30452c910837b704f2d51f0aa559 Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Thu, 9 Nov 2017 15:15:47 -0500 Subject: Fix stale data in openshift_facts for logging Currently, some stale facts may be present in '/etc/ansible/facts.d/openshift.fact' which causes openshift_facts to fail. This commit ensures that the data for the 'logging' key in that file is a dictionary; otherwise we re-initialize a new dictionary. Fixes: https://github.com/openshift/openshift-ansible/issues/6057 --- roles/openshift_facts/library/openshift_facts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/openshift_facts') diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index a88945538..7f393b564 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -490,7 +490,7 @@ def set_selectors(facts): facts['hosted']['metrics'] = {} if 'selector' not in facts['hosted']['metrics'] or facts['hosted']['metrics']['selector'] in [None, 'None']: facts['hosted']['metrics']['selector'] = None - if 'logging' not in facts: + if 'logging' not in facts or not isinstance(facts['logging'], dict): facts['logging'] = {} if 'selector' not in facts['logging'] or facts['logging']['selector'] in [None, 'None']: facts['logging']['selector'] = None -- cgit v1.2.1