diff options
| author | Serge van Ginderachter <serge@vanginderachter.be> | 2015-05-23 20:30:08 +0200 |
|---|---|---|
| committer | Serge van Ginderachter <serge@vanginderachter.be> | 2015-05-23 20:34:08 +0200 |
| commit | b6ea8de39999ccf67c0afcbeceb27345ab1cbb54 (patch) | |
| tree | f3388264ecfb54f1b1d11d34d41cd1d9a1aac27f | |
| parent | ed4df57361529020cfa09e6b316f1e3ea0acd05d (diff) | |
| download | ansible-b6ea8de39999ccf67c0afcbeceb27345ab1cbb54.tar.gz | |
limit extensions for files in group/host_vars dir
inventory vars: make loading from a directory obey the same rules as
when checking the base paths, looking at the file name extensions
as defined in CONSTANTS.YAML_FILENAME_EXTENSIONS
Fixes Github issue #11017
| -rw-r--r-- | lib/ansible/utils/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ansible/utils/__init__.py b/lib/ansible/utils/__init__.py index 476a1e28e8..eb6fa2a712 100644 --- a/lib/ansible/utils/__init__.py +++ b/lib/ansible/utils/__init__.py @@ -1617,7 +1617,9 @@ def _load_vars_from_folder(folder_path, results, vault_password=None): names.sort() # do not parse hidden files or dirs, e.g. .svn/ - paths = [os.path.join(folder_path, name) for name in names if not name.startswith('.')] + paths = [os.path.join(folder_path, name) for name in names + if not name.startswith('.') + and os.path.splitext(name)[1] in C.YAML_FILENAME_EXTENSIONS] for path in paths: _found, results = _load_vars_from_path(path, results, vault_password=vault_password) return results |