diff options
| author | Brian Coca <bcoca@users.noreply.github.com> | 2016-11-21 10:31:50 -0500 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2016-11-21 07:36:15 -0800 |
| commit | 74bb122598cfcb050c9090684320ec2d5253ae4c (patch) | |
| tree | 189984ebd72c19333409c5c6b16a0984087602f0 | |
| parent | 66779698f05c883dfc1bcc9b16d2f718a5a017dd (diff) | |
| download | ansible-74bb122598cfcb050c9090684320ec2d5253ae4c.tar.gz | |
change to ~ instead of $HOME to avoid undefined (#18551)
fixes #16032
(cherry picked from commit 6dece90a5746209c115afededf9a11c87491c3d8)
| -rw-r--r-- | examples/ansible.cfg | 4 | ||||
| -rw-r--r-- | lib/ansible/constants.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/ansible.cfg b/examples/ansible.cfg index 991dcb2548..06ba04a50d 100644 --- a/examples/ansible.cfg +++ b/examples/ansible.cfg @@ -13,8 +13,8 @@ #inventory = /etc/ansible/hosts #library = /usr/share/my_modules/ -#remote_tmp = $HOME/.ansible/tmp -#local_tmp = $HOME/.ansible/tmp +#remote_tmp = ~/.ansible/tmp +#local_tmp = ~/.ansible/tmp #forks = 5 #poll_interval = 15 #sudo_user = root diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index 05043c60b2..faa481da87 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -157,8 +157,8 @@ DEFAULT_DEBUG = get_config(p, DEFAULTS, 'debug', 'ANSIBLE DEFAULT_HOST_LIST = get_config(p, DEFAULTS,'inventory', 'ANSIBLE_INVENTORY', DEPRECATED_HOST_LIST, ispath=True) DEFAULT_MODULE_PATH = get_config(p, DEFAULTS, 'library', 'ANSIBLE_LIBRARY', None, ispathlist=True) DEFAULT_ROLES_PATH = get_config(p, DEFAULTS, 'roles_path', 'ANSIBLE_ROLES_PATH', '/etc/ansible/roles', ispathlist=True, expand_relative_paths=True) -DEFAULT_REMOTE_TMP = get_config(p, DEFAULTS, 'remote_tmp', 'ANSIBLE_REMOTE_TEMP', '$HOME/.ansible/tmp') -DEFAULT_LOCAL_TMP = get_config(p, DEFAULTS, 'local_tmp', 'ANSIBLE_LOCAL_TEMP', '$HOME/.ansible/tmp', istmppath=True) +DEFAULT_REMOTE_TMP = get_config(p, DEFAULTS, 'remote_tmp', 'ANSIBLE_REMOTE_TEMP', '~/.ansible/tmp') +DEFAULT_LOCAL_TMP = get_config(p, DEFAULTS, 'local_tmp', 'ANSIBLE_LOCAL_TEMP', '~/.ansible/tmp', istmppath=True) DEFAULT_MODULE_NAME = get_config(p, DEFAULTS, 'module_name', None, 'command') DEFAULT_FORKS = get_config(p, DEFAULTS, 'forks', 'ANSIBLE_FORKS', 5, integer=True) DEFAULT_MODULE_ARGS = get_config(p, DEFAULTS, 'module_args', 'ANSIBLE_MODULE_ARGS', '') |