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

Merge pull request #2179 from skinp/host_connection

Browse source 
Add support for connection type in ansible_hosts file
This commit is contained in:
Michael DeHaan 2013-02-23 09:58:17 -08:00
commit 5b31feb73b
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/runner/__init__.py
View file

@ -317,7 +317,8 @@ class Runner(object):
''' executes any module one or more times ''' ''' executes any module one or more times '''
host_variables = self.inventory.get_variables(host) host_variables = self.inventory.get_variables(host)
if self.transport in [ 'paramiko', 'ssh' ]: host_connection = host_variables.get('ansible_connection', self.transport)
if host_connection in [ 'paramiko', 'ssh' ]:
port = host_variables.get('ansible_ssh_port', self.remote_port) port = host_variables.get('ansible_ssh_port', self.remote_port)
if port is None: if port is None:
port = C.DEFAULT_REMOTE_PORT port = C.DEFAULT_REMOTE_PORT
@ -423,7 +424,8 @@ class Runner(object):
actual_port = port actual_port = port
actual_user = inject.get('ansible_ssh_user', self.remote_user) actual_user = inject.get('ansible_ssh_user', self.remote_user)
actual_pass = inject.get('ansible_ssh_pass', self.remote_pass) actual_pass = inject.get('ansible_ssh_pass', self.remote_pass)
if self.transport in [ 'paramiko', 'ssh' ]: actual_transport = inject.get('ansible_connection', self.transport)
if actual_transport in [ 'paramiko', 'ssh' ]:
actual_port = inject.get('ansible_ssh_port', port) 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
@ -445,6 +447,7 @@ class Runner(object):
actual_port = delegate_info.get('ansible_ssh_port', port) actual_port = delegate_info.get('ansible_ssh_port', port)
actual_user = delegate_info.get('ansible_ssh_user', actual_user) actual_user = delegate_info.get('ansible_ssh_user', actual_user)
actual_pass = delegate_info.get('ansible_ssh_pass', actual_pass) actual_pass = delegate_info.get('ansible_ssh_pass', actual_pass)
actual_transport = delegate_info.get('ansible_connection', self.transport)
for i in delegate_info: for i in delegate_info:
if i.startswith("ansible_") and i.endswith("_interpreter"): if i.startswith("ansible_") and i.endswith("_interpreter"):
inject[i] = delegate_info[i] inject[i] = delegate_info[i]
@ -463,7 +466,7 @@ class Runner(object):
return ReturnData(host=host, comm_ok=False, result=result) return ReturnData(host=host, comm_ok=False, result=result)
try: try:
conn = self.connector.connect(actual_host, actual_port, actual_user, actual_pass) conn = self.connector.connect(actual_host, actual_port, actual_user, actual_pass, actual_transport)
if delegate_to or host != actual_host: if delegate_to or host != actual_host:
conn.delegate = host conn.delegate = host

3
lib/ansible/runner/connection.py
View file

@ -31,9 +31,8 @@ class Connection(object):
def __init__(self, runner): def __init__(self, runner):
self.runner = runner self.runner = runner
def connect(self, host, port, user, password): def connect(self, host, port, user, password, transport):
conn = None conn = None
transport = self.runner.transport
conn = utils.plugins.connection_loader.get(transport, self.runner, host, port, user=user, password=password) conn = utils.plugins.connection_loader.get(transport, self.runner, host, port, user=user, password=password)
if conn is None: if conn is None:
raise AnsibleError("unsupported connection type: %s" % transport) raise AnsibleError("unsupported connection type: %s" % transport)