diff options
Diffstat (limited to 'roles')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 991b8da66..f708f9bac 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -644,7 +644,7 @@ def merge_facts(orig, new):      facts = dict()      for key, value in orig.iteritems():          if key in new: -            if isinstance(value, dict): +            if isinstance(value, dict) and isinstance(new[key], dict):                  facts[key] = merge_facts(value, new[key])              else:                  facts[key] = copy.copy(new[key]) | 
