Browse code

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

Brian Coca authored on 2017/06/03 07:45:36
Showing 2 changed files
... ...
@@ -72,7 +72,7 @@
72 72
 # enable callback plugins, they can output to stdout but cannot be 'stdout' type.
73 73
 #callback_whitelist = timer, mail
74 74
 
75
-# enable inventory plugins, default: 'host_list', 'script', 'ini', 'yaml'
75
+# enable inventory plugins, default: 'host_list', 'script', 'yaml', 'ini'
76 76
 #inventory_enabled = host_list, aws, openstack, docker
77 77
 
78 78
 # Determine whether includes in tasks and handlers are "static" by
... ...
@@ -242,7 +242,7 @@ NAMESPACE_FACTS = get_config(p, DEFAULTS, 'restrict_facts_namespace', 'ANSIBLE_R
242 242
 # Inventory
243 243
 DEFAULT_HOST_LIST = get_config(p, DEFAULTS, 'inventory', 'ANSIBLE_INVENTORY', '/etc/ansible/hosts', value_type='path', expand_relative_paths=True)
244 244
 INVENTORY_ENABLED = get_config(p, DEFAULTS, 'inventory_enabled', 'ANSIBLE_INVENTORY_ENABLED',
245
-                               ['host_list', 'script', 'ini', 'yaml'], value_type='list')
245
+                               ['host_list', 'script', 'yaml', 'ini'], value_type='list')
246 246
 INVENTORY_IGNORE_EXTS = get_config(p, DEFAULTS, 'inventory_ignore_extensions', 'ANSIBLE_INVENTORY_IGNORE',
247 247
                                    BLACKLIST_EXTS + (".orig", ".ini", ".cfg", ".retry"), value_type='list')
248 248
 INVENTORY_IGNORE_PATTERNS = get_config(p, DEFAULTS, 'inventory_ignore_patterns', 'ANSIBLE_INVENTORY_IGNORE_REGEX', [], value_type='list')