cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Setting options is fine if plugins already exist (#44859)

Browse source
This commit is contained in:
Nathaniel Case 2018-08-29 16:33:51 -04:00 committed by GitHub
parent cd7c946ea5
commit 149aa767ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/plugins/connection/__init__.py
View file

@ -319,8 +319,7 @@ class NetworkConnectionBase(ConnectionBase):
raise AttributeError("'%s' object has no attribute '%s'" % (self.__class__.__name__, name)) raise AttributeError("'%s' object has no attribute '%s'" % (self.__class__.__name__, name))
def _connect(self): def _connect(self):
for plugin in self._implementation_plugins: self.set_implementation_plugin_options(*self._cached_variables)
plugin.set_options(*self._cached_variables)
self._cached_variables = (None, None, None) self._cached_variables = (None, None, None)
def exec_command(self, cmd, in_data=None, sudoable=True): def exec_command(self, cmd, in_data=None, sudoable=True):
@ -350,7 +349,18 @@ class NetworkConnectionBase(ConnectionBase):
def set_options(self, task_keys=None, var_options=None, direct=None): def set_options(self, task_keys=None, var_options=None, direct=None):
super(NetworkConnectionBase, self).set_options(task_keys=task_keys, var_options=var_options, direct=direct) super(NetworkConnectionBase, self).set_options(task_keys=task_keys, var_options=var_options, direct=direct)
self._cached_variables = (task_keys, var_options, direct)
if self._implementation_plugins:
self.set_implementation_plugin_options(task_keys, var_options, direct)
else:
self._cached_variables = (task_keys, var_options, direct)
def set_implementation_plugin_options(self, task_keys=None, var_options=None, direct=None):
'''
initialize implementation plugin options
'''
for plugin in self._implementation_plugins:
plugin.set_options(task_keys=task_keys, var_options=var_options, direct=direct)
def _update_connection_state(self): def _update_connection_state(self):
''' '''