diff options
| author | Brian Coca <brian.coca+git@gmail.com> | 2015-01-29 13:28:33 -0500 |
|---|---|---|
| committer | Brian Coca <brian.coca+git@gmail.com> | 2015-01-29 13:28:33 -0500 |
| commit | 4fd760467b479045e5d0cb08a724e3831b46d3c8 (patch) | |
| tree | 52444c1250daf163078e5d2c46bced2d1de09604 /v2 | |
| parent | 751701c6f26403ff3f2ec8505bf8f7b961514b56 (diff) | |
| download | ansible-4fd760467b479045e5d0cb08a724e3831b46d3c8.tar.gz | |
made inventory consistent in config file, deprecated old config hostfile
Diffstat (limited to 'v2')
| -rw-r--r-- | v2/ansible/constants.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/v2/ansible/constants.py b/v2/ansible/constants.py index 6adcdd0a9f..d199cdf109 100644 --- a/v2/ansible/constants.py +++ b/v2/ansible/constants.py @@ -105,7 +105,7 @@ DEFAULTS='defaults' # configurable things DEFAULT_DEBUG = get_config(p, DEFAULTS, 'debug', 'ANSIBLE_DEBUG', False, boolean=True) -DEFAULT_HOST_LIST = shell_expand_path(get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', '/etc/ansible/hosts')) +DEFAULT_HOST_LIST = shell_expand_path(get_config(p, DEFAULTS, 'inventory', 'ANSIBLE_HOSTS', get_config(p, DEFAULTS,'hostfile',None, '/etc/ansible/hosts'))) DEFAULT_MODULE_PATH = get_config(p, DEFAULTS, 'library', 'ANSIBLE_LIBRARY', None) DEFAULT_ROLES_PATH = shell_expand_path(get_config(p, DEFAULTS, 'roles_path', 'ANSIBLE_ROLES_PATH', '/etc/ansible/roles')) DEFAULT_REMOTE_TMP = get_config(p, DEFAULTS, 'remote_tmp', 'ANSIBLE_REMOTE_TEMP', '$HOME/.ansible/tmp') |