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

Use YAML_FILENAME_EXTENSIONS for vars files.

Browse source 
The v2 codebase didn't use this previously introduced constant yet.

C.YAML_FILENAME_EXTENSIONS
This commit is contained in:
Serge van Ginderachter 2015-07-14 00:20:04 +02:00
parent c4b6d91275
commit d5fb11d89c
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

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