Skip to content

A
ansible
Commit 3ac86e57 by Michael DeHaan Committed by Matt Martz
Options

FIXME comment cleanup

parent 80499346
Showing with 2 additions and 4 deletions
lib/ansible/runner/__init__.py
...@@ -284,7 +284,7 @@ class Runner(object): ...@@ -284,7 +284,7 @@ class Runner(object):
# ***************************************************** # *****************************************************
def _compute_environment_string(self, conn, inject=None): # CCTODO: Changed this method signature def _compute_environment_string(self, conn, inject=None):
''' what environment variables to use when running the command? ''' ''' what environment variables to use when running the command? '''
enviro = {} enviro = {}
...@@ -759,9 +759,7 @@ class Runner(object): ...@@ -759,9 +759,7 @@ class Runner(object):
if not self.accelerate_port: if not self.accelerate_port:
self.accelerate_port = C.ACCELERATE_PORT self.accelerate_port = C.ACCELERATE_PORT
# CCTODO: Any reason not to do this regardless of connection type, and let the connection plugin ignore it? actual_port = inject.get('ansible_ssh_port', port)
if True:#actual_transport in [ 'paramiko', 'ssh', 'accelerate', 'winrm' ]:
actual_port = inject.get('ansible_ssh_port', port)
# the delegated host may have different SSH port configured, etc # the delegated host may have different SSH port configured, etc
# and we need to transfer those, and only those, variables # and we need to transfer those, and only those, variables
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment