wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Load plugin config defs on first load only (fixes #37553) (#37584)

Browse source
This commit is contained in:
Andrew Gaffney 2018-03-19 12:34:15 -05:00 committed by Brian Coca
parent 3e44186137
commit 0d0bdbec62
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/plugins/loader.py
View file

@ -348,9 +348,6 @@ class PluginLoader:
def _update_object(self, obj, name, path):
# load plugin config data
self._load_config_defs(name, path)
# set extra info on the module, in case we want it later
setattr(obj, '_original_path', path)
setattr(obj, '_load_name', name)
@ -394,6 +391,10 @@ class PluginLoader:
return None
raise
# load plugin config data
if not found_in_cache:
self._load_config_defs(name, path)
self._update_object(obj, name, path)
return obj
@ -467,6 +468,10 @@ class PluginLoader:
except TypeError as e:
display.warning("Skipping plugin (%s) as it seems to be incomplete: %s" % (path, to_text(e)))
# load plugin config data
if not found_in_cache:
self._load_config_defs(name, path)
self._update_object(obj, name, path)
yield obj