diff --git a/docs/docsite/rst/plugins/inventory.rst b/docs/docsite/rst/plugins/inventory.rst index 6d53c12d06..5b69686c51 100644 --- a/docs/docsite/rst/plugins/inventory.rst +++ b/docs/docsite/rst/plugins/inventory.rst @@ -22,7 +22,7 @@ config file that ships with Ansible: .. code-block:: ini [inventory] - enable_plugins = host_list, script, yaml, ini, auto + enable_plugins = host_list, script, auto, yaml, ini This list also establishes the order in which each plugin tries to parse an inventory source. Any plugins left out of the list will not be considered, so you can 'optimize' your inventory loading by minimizing it to what you actually use. For example: diff --git a/examples/ansible.cfg b/examples/ansible.cfg index b7904afc94..a93ee3e8e5 100644 --- a/examples/ansible.cfg +++ b/examples/ansible.cfg @@ -324,7 +324,7 @@ #any_errors_fatal = False [inventory] -# enable inventory plugins, default: 'host_list', 'script', 'yaml', 'ini', 'auto' +# enable inventory plugins, default: 'host_list', 'script', 'auto', 'yaml', 'ini' #enable_plugins = host_list, virtualbox, yaml, constructed # ignore these extensions when parsing a directory as inventory source diff --git a/lib/ansible/config/base.yml b/lib/ansible/config/base.yml index 996dbddc8f..475c09182a 100644 --- a/lib/ansible/config/base.yml +++ b/lib/ansible/config/base.yml @@ -1442,7 +1442,7 @@ INVENTORY_CACHE_TIMEOUT: - {key: cache_timeout, section: inventory} INVENTORY_ENABLED: name: Active Inventory plugins - default: ['host_list', 'script', 'yaml', 'ini', 'toml', 'auto'] + default: ['host_list', 'script', 'auto', 'yaml', 'ini', 'toml'] description: List of enabled inventory plugins, it also determines the order in which they are used. env: [{name: ANSIBLE_INVENTORY_ENABLED}] ini: diff --git a/lib/ansible/inventory/manager.py b/lib/ansible/inventory/manager.py index 1f43cea447..62d3e87b9a 100644 --- a/lib/ansible/inventory/manager.py +++ b/lib/ansible/inventory/manager.py @@ -263,7 +263,7 @@ class InventoryManager(object): if plugin_wants: try: - # in case plugin fails 1/2 way we dont want partial inventory + # FIXME in case plugin fails 1/2 way we have partial inventory plugin.parse(self._inventory, self._loader, source, cache=cache) parsed = True display.vvv('Parsed %s inventory source with %s plugin' % (source, plugin_name))