From e6bd04989271443854feab9da485803ef5115087 Mon Sep 17 00:00:00 2001 From: Veeti Paananen Date: Tue, 29 Jul 2014 15:13:50 +0300 Subject: [PATCH 1/2] Don't expand remote_tmp path locally --- lib/ansible/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index fb3e2420e95..0bd88905a51 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -105,7 +105,7 @@ DEFAULTS='defaults' DEFAULT_HOST_LIST = shell_expand_path(get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', '/etc/ansible/hosts')) DEFAULT_MODULE_PATH = get_config(p, DEFAULTS, 'library', 'ANSIBLE_LIBRARY', DIST_MODULE_PATH) DEFAULT_ROLES_PATH = shell_expand_path(get_config(p, DEFAULTS, 'roles_path', 'ANSIBLE_ROLES_PATH', '/etc/ansible/roles')) -DEFAULT_REMOTE_TMP = shell_expand_path(get_config(p, DEFAULTS, 'remote_tmp', 'ANSIBLE_REMOTE_TEMP', '$HOME/.ansible/tmp')) +DEFAULT_REMOTE_TMP = get_config(p, DEFAULTS, 'remote_tmp', 'ANSIBLE_REMOTE_TEMP', '$HOME/.ansible/tmp') DEFAULT_MODULE_NAME = get_config(p, DEFAULTS, 'module_name', None, 'command') DEFAULT_PATTERN = get_config(p, DEFAULTS, 'pattern', None, '*') DEFAULT_FORKS = get_config(p, DEFAULTS, 'forks', 'ANSIBLE_FORKS', 5, integer=True) From 5780f3a8b4a868379fc0167d8e4d897644165d85 Mon Sep 17 00:00:00 2001 From: Veeti Paananen Date: Tue, 29 Jul 2014 15:20:30 +0300 Subject: [PATCH 2/2] Expand variables in configuration files, take two e.g. $HOME. --- lib/ansible/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index 0bd88905a51..4d50f0dbe78 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -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.expanduser(os.path.expandvars(path)) return path p = load_config_file()