diff options
| author | Jacob Floyd <cognifloyd@gmail.com> | 2017-10-11 19:28:12 -0500 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2017-10-11 17:28:46 -0700 |
| commit | b1038b79036fe9493a816d4c22e2993f3a371053 (patch) | |
| tree | 10fa23b372d2398b3f9092c56fed0e7cdb57dd95 | |
| parent | 878ed2c079b331ef0c531e8dbedad0debdf22a38 (diff) | |
| download | ansible-b1038b79036fe9493a816d4c22e2993f3a371053.tar.gz | |
Fix Inventory Plugin Loading (#31605)
This change makes the PluginLoader use DEFAULT_INVENTORY_PLUGIN_PATH setting.
Inventory Plugins were only being loaded the 'inventory_plugins' folder of the current directory,
as well as the ansible-provided inventory plugins (e.g. `/path/to/site-packages/ansible/plugins/inventory`).
(cherry picked from commit 0371d0deda7d50e61b565f712ca1ea3f42f03559)
| -rw-r--r-- | lib/ansible/inventory/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/inventory/manager.py b/lib/ansible/inventory/manager.py index c2cfb845c2..6eab40ae91 100644 --- a/lib/ansible/inventory/manager.py +++ b/lib/ansible/inventory/manager.py @@ -177,7 +177,7 @@ class InventoryManager(object): def _setup_inventory_plugins(self): ''' sets up loaded inventory plugins for usage ''' - inventory_loader = PluginLoader('InventoryModule', 'ansible.plugins.inventory', 'inventory_plugins', 'inventory_plugins') + inventory_loader = PluginLoader('InventoryModule', 'ansible.plugins.inventory', C.DEFAULT_INVENTORY_PLUGIN_PATH, 'inventory_plugins') display.vvvv('setting up inventory plugins') for name in C.INVENTORY_ENABLED: |