internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix read vaulted toml inventory (#54226) (#54235)

Browse Source
This commit is contained in:
咚咔
2019-04-10 22:10:48 +08:00
committed by Matt Martz
parent 54384e7a12
commit 72fc11ff13
4 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ansible/plugins/inventory/toml.py
View File

@@ -95,7 +95,7 @@ import os
from functools import partial
from ansible.errors import AnsibleFileNotFound, AnsibleParserError
from ansible.module_utils._text import to_bytes, to_native
from ansible.module_utils._text import to_bytes, to_native, to_text
from ansible.module_utils.common._collections_compat import MutableMapping, MutableSequence
from ansible.module_utils.six import string_types, text_type
from ansible.parsing.yaml.objects import AnsibleSequence, AnsibleUnicode
@@ -211,8 +211,8 @@ class InventoryModule(BaseFileInventoryPlugin):
raise AnsibleFileNotFound("Unable to retrieve file contents", file_name=file_name)
try:
with open(b_file_name, 'r') as f:
return toml.load(f)
(b_data, private) = self.loader._get_file_contents(file_name)
return toml.loads(to_text(b_data, errors='surrogate_or_strict'))
except toml.TomlDecodeError as e:
raise AnsibleParserError(
'TOML file (%s) is invalid: %s' % (file_name, to_native(e)),