diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-20 14:57:32 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-20 14:57:32 -0400 |
| commit | 6f4b3ff2b0580e535258726d950bf988995b4208 (patch) | |
| tree | 7c63931378ccc0197fa56a2ae4774c30cad73f0c /roles/openshift_facts | |
| parent | 1b4bf065f84a28426a010cdc47669b88d5515e34 (diff) | |
| parent | a1bb23b8abec1e700407534ce31ded5dbe077d0e (diff) | |
| download | openshift-6f4b3ff2b0580e535258726d950bf988995b4208.tar.gz openshift-6f4b3ff2b0580e535258726d950bf988995b4208.tar.bz2 openshift-6f4b3ff2b0580e535258726d950bf988995b4208.tar.xz openshift-6f4b3ff2b0580e535258726d950bf988995b4208.zip | |
Merge pull request #1758 from dgoodwin/fix-json-vars
Fix use of JSON inventory vars with raw booleans.
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 fe5fdd246..48b117b8f 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1218,7 +1218,7 @@ def merge_facts(orig, new, additive_facts_to_overwrite, protected_facts_to_overw if key in inventory_json_facts: # Watchout for JSON facts that sometimes load as strings. # (can happen if the JSON contains a boolean) - if isinstance(new[key], str): + if isinstance(new[key], basestring): facts[key] = yaml.safe_load(new[key]) else: facts[key] = copy.deepcopy(new[key]) |