diff options
| author | Brian Coca <brian.coca+git@gmail.com> | 2017-06-02 18:45:36 -0400 |
|---|---|---|
| committer | Brian Coca <brian.coca+git@gmail.com> | 2017-06-02 18:47:07 -0400 |
| commit | 4aeca601f473f4c35640a0fb59b5def8f8b93467 (patch) | |
| tree | d94389fd5e88c368a807354e14b6f46e6baa3cae | |
| parent | 5d0340a9e39b62ef4ecb9d049233f224036dfd33 (diff) | |
| download | ansible-4aeca601f473f4c35640a0fb59b5def8f8b93467.tar.gz | |
corrected default inventory plugin order
default inventory plugin order now follows the hardcoded one in previous versions
yaml plugin shoudl run before ini to avoid ini being able to parse some yaml files succesfully.
fixes #25321
| -rw-r--r-- | examples/ansible.cfg | 2 | ||||
| -rw-r--r-- | lib/ansible/constants.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/ansible.cfg b/examples/ansible.cfg index 069055539d..dc8d8b7443 100644 --- a/examples/ansible.cfg +++ b/examples/ansible.cfg @@ -72,7 +72,7 @@ # enable callback plugins, they can output to stdout but cannot be 'stdout' type. #callback_whitelist = timer, mail -# enable inventory plugins, default: 'host_list', 'script', 'ini', 'yaml' +# enable inventory plugins, default: 'host_list', 'script', 'yaml', 'ini' #inventory_enabled = host_list, aws, openstack, docker # Determine whether includes in tasks and handlers are "static" by diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index 666d042cf4..de4875d646 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -242,7 +242,7 @@ NAMESPACE_FACTS = get_config(p, DEFAULTS, 'restrict_facts_namespace', 'ANSIBLE_R # Inventory DEFAULT_HOST_LIST = get_config(p, DEFAULTS, 'inventory', 'ANSIBLE_INVENTORY', '/etc/ansible/hosts', value_type='path', expand_relative_paths=True) INVENTORY_ENABLED = get_config(p, DEFAULTS, 'inventory_enabled', 'ANSIBLE_INVENTORY_ENABLED', - ['host_list', 'script', 'ini', 'yaml'], value_type='list') + ['host_list', 'script', 'yaml', 'ini'], value_type='list') INVENTORY_IGNORE_EXTS = get_config(p, DEFAULTS, 'inventory_ignore_extensions', 'ANSIBLE_INVENTORY_IGNORE', BLACKLIST_EXTS + (".orig", ".ini", ".cfg", ".retry"), value_type='list') INVENTORY_IGNORE_PATTERNS = get_config(p, DEFAULTS, 'inventory_ignore_patterns', 'ANSIBLE_INVENTORY_IGNORE_REGEX', [], value_type='list') |