Merge pull request #8309 from veeti/cfg-vars

Expand variables in configuration files
This commit is contained in:
Michael DeHaan 2014-07-28 15:47:45 -04:00
commit 97fa9502aa

View file

@ -79,7 +79,7 @@ def shell_expand_path(path):
''' shell_expand_path is needed as os.path.expanduser does not work
when path is None, which is the default for ANSIBLE_PRIVATE_KEY_FILE '''
if path:
path = os.path.expanduser(path)
path = os.path.expandvars(os.path.expanduser(path))
return path
p = load_config_file()