diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-09-28 12:58:35 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-09-28 12:58:35 -0400 |
| commit | d865b2a9034130ec85a14638e0350b115401c94c (patch) | |
| tree | 33c943d808aa5293848fd57117f044f75ff4a77d /roles/openshift_facts | |
| parent | 7754d298916e3e5722b664acf489ed0662b47155 (diff) | |
| parent | 9646ab206e5984ede420500343ccba5b81dd6187 (diff) | |
| download | openshift-d865b2a9034130ec85a14638e0350b115401c94c.tar.gz openshift-d865b2a9034130ec85a14638e0350b115401c94c.tar.bz2 openshift-d865b2a9034130ec85a14638e0350b115401c94c.tar.xz openshift-d865b2a9034130ec85a14638e0350b115401c94c.zip | |
Merge pull request #624 from abutcher/merge-facts
Avoid attribute error in merge facts
Diffstat (limited to 'roles/openshift_facts')
| -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]) |