Merge pull request #11577 from srvg/yaml_file_extensions

Use YAML_FILENAME_EXTENSIONS for vars files.
9 years ago · e0632cb9a4
parent 5daa540bc0 d5fb11d89c
commit e0632cb9a4
1 changed files with 3 additions and 3 deletions
--- a/lib/ansible/vars/init.py
+++ b/lib/ansible/vars/init.py
@ -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)