Fix setting required options for inventory plugins (ansible#42049)

* Fix setting required options for inventory plugins * call set_options for yaml and script plugin
acozine · Jun 29, 2018 · 44e5886 · 44e5886
1 parent aea396f
commit 44e5886
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/lib/ansible/inventory/manager.py b/lib/ansible/inventory/manager.py
@@ -183,7 +183,6 @@ def _setup_inventory_plugins(self):
         for name in C.INVENTORY_ENABLED:
             plugin = inventory_loader.get(name)
             if plugin:
-                plugin.set_options()
                 self._inventory_plugins.append(plugin)
             else:
                 display.warning('Failed to load inventory plugin, skipping %s' % name)

diff --git a/lib/ansible/plugins/inventory/script.py b/lib/ansible/plugins/inventory/script.py
@@ -85,6 +85,7 @@ def verify_file(self, path):
     def parse(self, inventory, loader, path, cache=None):
 
         super(InventoryModule, self).parse(inventory, loader, path)
+        self.set_options()
 
         if cache is None:
             cache = self.get_option('cache')

diff --git a/lib/ansible/plugins/inventory/yaml.py b/lib/ansible/plugins/inventory/yaml.py
@@ -90,6 +90,7 @@ def parse(self, inventory, loader, path, cache=True):
         ''' parses the inventory file '''
 
         super(InventoryModule, self).parse(inventory, loader, path)
+        self.set_options()
 
         try:
             data = self.loader.load_from_file(path, cache=False)