cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #11577 from srvg/yaml_file_extensions

Browse source 
Use YAML_FILENAME_EXTENSIONS for vars files.
This commit is contained in:
Brian Coca 2015-07-13 18:29:26 -04:00
commit e0632cb9a4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/vars/__init__.py
View file

@ -315,11 +315,11 @@ class VariableManager:
file_name, ext = os.path.splitext(path)
data = None
if not ext:
for ext in ('', '.yml', '.yaml'):
for ext in C.YAML_FILENAME_EXTENSIONS:
new_path = path + ext
if loader.path_exists(new_path):
data = loader.load_from_file(new_path)
break
data = loader.load_from_file(new_path)
break
else:
if loader.path_exists(path):
data = loader.load_from_file(path)