internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

When using delegation, local_action should always use the local connection type.

Browse Source
This commit is contained in:
Michael DeHaan
2012-10-18 20:14:15 -04:00
parent d58bc4da4e
commit 31b45479e8
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ansible/runner/__init__.py
View File

@@ -49,7 +49,7 @@ dirname = os.path.dirname(__file__)
action_plugin_list = utils.import_plugins(os.path.join(dirname, 'action_plugins'))
for i in reversed(C.DEFAULT_ACTION_PLUGIN_PATH.split(os.pathsep)):
action_plugin_list.update(utils.import_plugins(i))
lookup_plugin_list = utils.import_plugins(os.path.join(dirname, 'lookup_plugins'))
lookup_plugin_list = utils.import_plugins(os.path.join(dirname, 'lookup_plugins'))
for i in reversed(C.DEFAULT_LOOKUP_PLUGIN_PATH.split(os.pathsep)):
lookup_plugin_list.update(utils.import_plugins(i))
@@ -285,7 +285,7 @@ class Runner(object):
if self.transport in [ 'paramiko', 'ssh' ]:
port = host_variables.get('ansible_ssh_port', self.remote_port)
if port is None:
port = C.DEFAULT_REMOTE_PORT
port = C.DEFAULT_REMOTE_PORT
else:
# fireball, local, etc
port = self.remote_port
@@ -399,11 +399,14 @@ class Runner(object):
actual_host = delegate_to
try:
# connect
conn = self.connector.connect(actual_host, int(actual_port))
transport = None # use Runner setting
if delegate_to and actual_host in [ '127.0.0.1', 'localhost' ]:
transport = 'local'
conn = self.connector.connect(actual_host, int(actual_port), transport=transport)
if delegate_to:
conn.delegate = host
except errors.AnsibleConnectionFailed, e:
result = dict(failed=True, msg="FAILED: %s" % str(e))
return ReturnData(host=host, comm_ok=False, result=result)

5
lib/ansible/runner/connection.py
View File

@@ -40,12 +40,13 @@ class Connection(object):
self.runner = runner
self.modules = None
def connect(self, host, port):
def connect(self, host, port, transport=None):
if self.modules is None:
self.modules = modules.copy()
self.modules.update(utils.import_plugins(os.path.join(self.runner.basedir, 'connection_plugins')))
conn = None
transport = self.runner.transport
if transport is None:
transport = self.runner.transport
module = self.modules.get(transport, None)
if module is None:
raise AnsibleError("unsupported connection type: %s" % transport)